summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
AgeCommit message (Expand)AuthorFilesLines
2021-10-29Document positive variant of commit and merge option "--no-verify"Libravatar Alex Riesen1-2/+3
2021-08-30Merge branch 'en/ort-becomes-the-default'Libravatar Junio C Hamano1-1/+1
2021-08-30Merge branch 'en/merge-strategy-docs'Libravatar Junio C Hamano1-2/+2
2021-08-30Merge branch 'en/pull-conflicting-options'Libravatar Junio C Hamano1-0/+40
2021-08-05Update docs for change of default merge backendLibravatar Elijah Newren1-1/+1
2021-08-05Documentation: edit awkward references to `git merge-recursive`Libravatar Elijah Newren1-2/+2
2021-07-23Documentation: define 'MERGE_AUTOSTASH'Libravatar Philippe Blain1-1/+2
2021-07-22pull: update docs & code for option compatibility with rebasingLibravatar Elijah Newren1-0/+40
2020-10-20doc: preparatory clean-up of description on the sign-off optionLibravatar Junio C Hamano1-10/+1
2020-04-29Merge branch 'dl/merge-autostash'Libravatar Junio C Hamano1-0/+8
2020-04-10pull: pass --autostash to mergeLibravatar Denton Liu1-2/+2
2020-04-10merge: teach --autostash optionLibravatar Denton Liu1-0/+8
2020-04-03Documentation: document merge option --no-gpg-signLibravatar Đoàn Trần Công Danh1-1/+4
2019-11-07Documentation: fix a bunch of typos, both old and newLibravatar Elijah Newren1-1/+1
2019-09-30Merge branch 'en/merge-options-ff-and-friends'Libravatar Junio C Hamano1-12/+16
2019-09-01merge-options.txt: clarify meaning of various ff-related optionsLibravatar Elijah Newren1-12/+16
2019-08-07merge: do no-verify like commitLibravatar Michael J Gruber1-0/+4
2019-07-25Merge branch 'vv/merge-squash-with-explicit-commit' into maintLibravatar Junio C Hamano1-0/+2
2019-06-17Merge branch 'vv/merge-squash-with-explicit-commit'Libravatar Junio C Hamano1-0/+2
2019-05-28merge: refuse --commit with --squashLibravatar Vishal Verma1-0/+2
2019-04-18merge: add scissors line on merge conflictLibravatar Denton Liu1-2/+5
2019-04-18merge: cleanup messages like commitLibravatar Denton Liu1-0/+4
2019-02-21merge-options.txt: correct wording of --no-commit optionLibravatar Elijah Newren1-3/+8
2018-02-16merge: allow fast-forward when merging a tracked tagLibravatar Junio C Hamano1-1/+2
2017-11-06Merge branch 'wk/pull-signoff'Libravatar Junio C Hamano1-0/+10
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Libravatar Junio C Hamano1-0/+6
2017-10-13pull: pass --signoff/--no-signoff to "git merge"Libravatar W. Trevor King1-0/+10
2017-10-12Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'Libravatar W. Trevor King1-0/+6
2017-08-23treewide: correct several "up-to-date" to "up to date"Libravatar Martin Ågren1-1/+1
2016-05-17Merge branch 'kf/gpg-sig-verification-doc'Libravatar Junio C Hamano1-2/+5
2016-05-13Documentation: clarify signature verificationLibravatar Keller Fuchs1-2/+5
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Libravatar Junio C Hamano1-0/+8
2014-03-31Documentation: fix misuses of "nor"Libravatar Justin Lebar1-8/+7
2014-01-27Merge branch 'jc/maint-pull-docfix'Libravatar Junio C Hamano1-3/+6
2014-01-14Documentation: "git pull" does not have the "-m" optionLibravatar Junio C Hamano1-3/+6
2013-06-02Merge branch 'rh/merge-options-doc-fix'Libravatar Junio C Hamano1-1/+2
2013-05-16Documentation/merge-options.txt: restore `-e` optionLibravatar Richard Hansen1-1/+2
2013-04-05Merge branch 'sg/gpg-sig'Libravatar Junio C Hamano1-0/+5
2013-03-31merge/pull Check for untrusted good GPG signaturesLibravatar Sebastian Götte1-2/+2
2013-03-31merge/pull: verify GPG signatures of commits being mergedLibravatar Sebastian Götte1-0/+5
2013-03-21Documentation: merging a tag is a special caseLibravatar Junio C Hamano1-1/+2
2012-02-26Merge branch 'jc/doc-merge-options'Libravatar Junio C Hamano1-11/+11
2012-02-22Documentation/merge-options.txt: group "ff" related options togetherLibravatar Junio C Hamano1-11/+11
2012-01-23merge: use editor by default in interactive sessionsLibravatar Junio C Hamano1-3/+13
2011-12-05Documentation: fix formatting error in merge-options.txtLibravatar Jack Nagel1-1/+0
2011-10-12Teach merge the '[-e|--edit]' optionLibravatar Jay Soffian1-0/+6
2011-02-21merge: enable progress reporting for rename detectionLibravatar Jeff King1-1/+9
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesLibravatar Ramkumar Ramachandra1-3/+3
2010-04-13Merge branch 'maint'Libravatar Junio C Hamano1-5/+5
2010-04-12Docs: Add -X option to git-merge's synopsis.Libravatar Marc Branchaud1-5/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 13:25:40 +0000