path: root/Documentation/merge-options.txt
AgeCommit message (Expand)Author
2021-10-29Document positive variant of commit and merge option "--no-verify"Alex Riesen
2021-08-30Merge branch 'en/ort-becomes-the-default'Junio C Hamano
2021-08-30Merge branch 'en/merge-strategy-docs'Junio C Hamano
2021-08-30Merge branch 'en/pull-conflicting-options'Junio C Hamano
2021-08-05Update docs for change of default merge backendElijah Newren
2021-08-05Documentation: edit awkward references to `git merge-recursive`Elijah Newren
2021-07-23Documentation: define 'MERGE_AUTOSTASH'Philippe Blain
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren
2020-10-20doc: preparatory clean-up of description on the sign-off optionJunio C Hamano
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano
2020-04-10pull: pass --autostash to mergeDenton Liu
2020-04-10merge: teach --autostash optionDenton Liu
2020-04-03Documentation: document merge option --no-gpg-signĐoàn Trần Công Danh
2019-11-07Documentation: fix a bunch of typos, both old and newElijah Newren
2019-09-30Merge branch 'en/merge-options-ff-and-friends'Junio C Hamano
2019-09-01merge-options.txt: clarify meaning of various ff-related optionsElijah Newren
2019-08-07merge: do no-verify like commitMichael J Gruber
2019-07-25Merge branch 'vv/merge-squash-with-explicit-commit' into maintJunio C Hamano
2019-06-17Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano
2019-05-28merge: refuse --commit with --squashVishal Verma
2019-04-18merge: add scissors line on merge conflictDenton Liu
2019-04-18merge: cleanup messages like commitDenton Liu
2019-02-21merge-options.txt: correct wording of --no-commit optionElijah Newren
2018-02-16merge: allow fast-forward when merging a tracked tagJunio C Hamano
2017-11-06Merge branch 'wk/pull-signoff'Junio C Hamano
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King
2017-10-12Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'W. Trevor King
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren
2016-05-17Merge branch 'kf/gpg-sig-verification-doc'Junio C Hamano
2016-05-13Documentation: clarify signature verificationKeller Fuchs
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano
2014-03-31Documentation: fix misuses of "nor"Justin Lebar
2014-01-27Merge branch 'jc/maint-pull-docfix'Junio C Hamano
2014-01-14Documentation: "git pull" does not have the "-m" optionJunio C Hamano
2013-06-02Merge branch 'rh/merge-options-doc-fix'Junio C Hamano
2013-05-16Documentation/merge-options.txt: restore `-e` optionRichard Hansen
2013-04-05Merge branch 'sg/gpg-sig'Junio C Hamano
2013-04-01merge/pull Check for untrusted good GPG signaturesSebastian Götte
2013-04-01merge/pull: verify GPG signatures of commits being mergedSebastian Götte
2013-03-21Documentation: merging a tag is a special caseJunio C Hamano
2012-02-27Merge branch 'jc/doc-merge-options'Junio C Hamano
2012-02-22Documentation/merge-options.txt: group "ff" related options togetherJunio C Hamano
2012-01-23merge: use editor by default in interactive sessionsJunio C Hamano
2011-12-05Documentation: fix formatting error in merge-options.txtJack Nagel
2011-10-12Teach merge the '[-e|--edit]' optionJay Soffian
2011-02-21merge: enable progress reporting for rename detectionJeff King
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra
2010-04-14Merge branch 'maint'Junio C Hamano
2010-04-12Docs: Add -X option to git-merge's synopsis.Marc Branchaud