Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Documentation
/
merge-options.txt
Age
Commit message (
Expand
)
Author
2021-10-29
Document positive variant of commit and merge option "--no-verify"
Alex Riesen
2021-08-31
Merge branch 'en/ort-becomes-the-default'
Junio C Hamano
2021-08-31
Merge branch 'en/merge-strategy-docs'
Junio C Hamano
2021-08-31
Merge branch 'en/pull-conflicting-options'
Junio C Hamano
2021-08-06
Update docs for change of default merge backend
Elijah Newren
2021-08-05
Documentation: edit awkward references to `git merge-recursive`
Elijah Newren
2021-07-24
Documentation: define 'MERGE_AUTOSTASH'
Philippe Blain
2021-07-22
pull: update docs & code for option compatibility with rebasing
Elijah Newren
2020-10-20
doc: preparatory clean-up of description on the sign-off option
Junio C Hamano
2020-04-30
Merge branch 'dl/merge-autostash'
Junio C Hamano
2020-04-10
pull: pass --autostash to merge
Denton Liu
2020-04-10
merge: teach --autostash option
Denton Liu
2020-04-03
Documentation: document merge option --no-gpg-sign
Đoàn Trần Công Danh
2019-11-07
Documentation: fix a bunch of typos, both old and new
Elijah Newren
2019-09-30
Merge branch 'en/merge-options-ff-and-friends'
Junio C Hamano
2019-09-01
merge-options.txt: clarify meaning of various ff-related options
Elijah Newren
2019-08-07
merge: do no-verify like commit
Michael J Gruber
2019-07-26
Merge branch 'vv/merge-squash-with-explicit-commit' into maint
Junio C Hamano
2019-06-17
Merge branch 'vv/merge-squash-with-explicit-commit'
Junio C Hamano
2019-05-28
merge: refuse --commit with --squash
Vishal Verma
2019-04-18
merge: add scissors line on merge conflict
Denton Liu
2019-04-18
merge: cleanup messages like commit
Denton Liu
2019-02-21
merge-options.txt: correct wording of --no-commit option
Elijah Newren
2018-02-16
merge: allow fast-forward when merging a tracked tag
Junio C Hamano
2017-11-06
Merge branch 'wk/pull-signoff'
Junio C Hamano
2017-10-19
Merge branch 'wk/merge-options-gpg-sign-doc'
Junio C Hamano
2017-10-13
pull: pass --signoff/--no-signoff to "git merge"
W. Trevor King
2017-10-12
Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
W. Trevor King
2017-08-23
treewide: correct several "up-to-date" to "up to date"
Martin Ågren
2016-05-18
Merge branch 'kf/gpg-sig-verification-doc'
Junio C Hamano
2016-05-13
Documentation: clarify signature verification
Keller Fuchs
2016-04-21
pull: pass --allow-unrelated-histories to "git merge"
Junio C Hamano
2014-04-01
Documentation: fix misuses of "nor"
Justin Lebar
2014-01-27
Merge branch 'jc/maint-pull-docfix'
Junio C Hamano
2014-01-14
Documentation: "git pull" does not have the "-m" option
Junio C Hamano
2013-06-03
Merge branch 'rh/merge-options-doc-fix'
Junio C Hamano
2013-05-17
Documentation/merge-options.txt: restore `-e` option
Richard Hansen
2013-04-06
Merge branch 'sg/gpg-sig'
Junio C Hamano
2013-04-01
merge/pull Check for untrusted good GPG signatures
Sebastian Götte
2013-04-01
merge/pull: verify GPG signatures of commits being merged
Sebastian Götte
2013-03-22
Documentation: merging a tag is a special case
Junio C Hamano
2012-02-27
Merge branch 'jc/doc-merge-options'
Junio C Hamano
2012-02-23
Documentation/merge-options.txt: group "ff" related options together
Junio C Hamano
2012-01-24
merge: use editor by default in interactive sessions
Junio C Hamano
2011-12-05
Documentation: fix formatting error in merge-options.txt
Jack Nagel
2011-10-13
Teach merge the '[-e|--edit]' option
Jay Soffian
2011-02-21
merge: enable progress reporting for rename detection
Jeff King
2010-09-09
merge: Make '--log' an integer option for number of shortlog entries
Ramkumar Ramachandra
2010-04-14
Merge branch 'maint'
Junio C Hamano
2010-04-12
Docs: Add -X option to git-merge's synopsis.
Marc Branchaud
[next]