summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
Commit message (Expand)AuthorAgeFilesLines
* Document positive variant of commit and merge option "--no-verify"Alex Riesen2021-10-291-2/+3
* Merge branch 'en/ort-becomes-the-default'Junio C Hamano2021-08-301-1/+1
|\
| * Update docs for change of default merge backendElijah Newren2021-08-051-1/+1
* | Merge branch 'en/merge-strategy-docs'Junio C Hamano2021-08-301-2/+2
|\ \ | |/
| * Documentation: edit awkward references to `git merge-recursive`Elijah Newren2021-08-051-2/+2
* | Merge branch 'en/pull-conflicting-options'Junio C Hamano2021-08-301-0/+40
|\ \
| * | pull: update docs & code for option compatibility with rebasingElijah Newren2021-07-221-0/+40
| |/
* | Documentation: define 'MERGE_AUTOSTASH'Philippe Blain2021-07-231-1/+2
|/
* doc: preparatory clean-up of description on the sign-off optionJunio C Hamano2020-10-201-10/+1
* Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-291-0/+8
|\
| * pull: pass --autostash to mergeDenton Liu2020-04-101-2/+2
| * merge: teach --autostash optionDenton Liu2020-04-101-0/+8
* | Documentation: document merge option --no-gpg-signĐoàn Trần Công Danh2020-04-031-1/+4
|/
* Documentation: fix a bunch of typos, both old and newElijah Newren2019-11-071-1/+1
* Merge branch 'en/merge-options-ff-and-friends'Junio C Hamano2019-09-301-12/+16
|\
| * merge-options.txt: clarify meaning of various ff-related optionsElijah Newren2019-09-011-12/+16
| * Merge branch 'vv/merge-squash-with-explicit-commit' into maintJunio C Hamano2019-07-251-0/+2
| |\
* | | merge: do no-verify like commitMichael J Gruber2019-08-071-0/+4
* | | Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano2019-06-171-0/+2
|\ \ \ | |/ / |/| / | |/
| * merge: refuse --commit with --squashVishal Verma2019-05-281-0/+2
* | merge: add scissors line on merge conflictDenton Liu2019-04-181-2/+5
* | merge: cleanup messages like commitDenton Liu2019-04-181-0/+4
* | merge-options.txt: correct wording of --no-commit optionElijah Newren2019-02-211-3/+8
|/
* merge: allow fast-forward when merging a tracked tagjc/allow-ff-merging-kept-tagsJunio C Hamano2018-02-161-1/+2
* Merge branch 'wk/pull-signoff'Junio C Hamano2017-11-061-0/+10
|\
| * pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoffW. Trevor King2017-10-131-0/+10
* | Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano2017-10-191-0/+6
|\ \ | |/ |/|
| * Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'wk/merge-options-gpg-sign-docW. Trevor King2017-10-121-0/+6
* | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-1/+1
|/
* Merge branch 'kf/gpg-sig-verification-doc'Junio C Hamano2016-05-171-2/+5
|\
| * Documentation: clarify signature verificationkf/gpg-sig-verification-docKeller Fuchs2016-05-131-2/+5
* | pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-rootJunio C Hamano2016-04-211-0/+8
|/
* Documentation: fix misuses of "nor"Justin Lebar2014-03-311-8/+7
* Merge branch 'jc/maint-pull-docfix'Junio C Hamano2014-01-271-3/+6
|\
| * Documentation: "git pull" does not have the "-m" optionjc/maint-pull-docfixJunio C Hamano2014-01-141-3/+6
* | Merge branch 'rh/merge-options-doc-fix'Junio C Hamano2013-06-021-1/+2
|\ \ | |/
| * Documentation/merge-options.txt: restore `-e` optionRichard Hansen2013-05-161-1/+2
* | Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-051-0/+5
|\ \ | |/ |/|
| * merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-311-2/+2
| * merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-311-0/+5
* | Documentation: merging a tag is a special caseJunio C Hamano2013-03-211-1/+2
|/
* Merge branch 'jc/doc-merge-options'Junio C Hamano2012-02-261-11/+11
|\
| * Documentation/merge-options.txt: group "ff" related options togetherjc/doc-merge-optionsJunio C Hamano2012-02-221-11/+11
| * Documentation: fix formatting error in merge-options.txtjs/merge-edit-optionJack Nagel2011-12-051-1/+0
* | merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-3/+13
|/
* Teach merge the '[-e|--edit]' optionJay Soffian2011-10-121-0/+6
* merge: enable progress reporting for rename detectionJeff King2011-02-211-1/+9
* merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-091-3/+3
* Merge branch 'maint'Junio C Hamano2010-04-131-5/+5
|\
| * Docs: Add -X option to git-merge's synopsis.Marc Branchaud2010-04-121-5/+5
View Lorry Controller Status