aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/merge-options.txt
AgeCommit message (Expand)AuthorFilesLines
2023-12-15docs: MERGE_AUTOSTASH is not that specialJunio C Hamano1-1/+1
2021-10-29Document positive variant of commit and merge option "--no-verify"Alex Riesen1-2/+3
2021-08-30Merge branch 'en/ort-becomes-the-default'Junio C Hamano1-1/+1
2021-08-30Merge branch 'en/merge-strategy-docs'Junio C Hamano1-2/+2
2021-08-30Merge branch 'en/pull-conflicting-options'Junio C Hamano1-0/+40
2021-08-05Update docs for change of default merge backendElijah Newren1-1/+1
2021-08-05Documentation: edit awkward references to `git merge-recursive`Elijah Newren1-2/+2
2021-07-23Documentation: define 'MERGE_AUTOSTASH'Philippe Blain1-1/+2
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren1-0/+40
2020-10-20doc: preparatory clean-up of description on the sign-off optionJunio C Hamano1-10/+1
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano1-0/+8
2020-04-10pull: pass --autostash to mergeDenton Liu1-2/+2
2020-04-10merge: teach --autostash optionDenton Liu1-0/+8
2020-04-03Documentation: document merge option --no-gpg-signĐoàn Trần Công Danh1-1/+4
2019-11-07Documentation: fix a bunch of typos, both old and newElijah Newren1-1/+1
2019-09-30Merge branch 'en/merge-options-ff-and-friends'Junio C Hamano1-12/+16
2019-09-01merge-options.txt: clarify meaning of various ff-related optionsElijah Newren1-12/+16
2019-08-07merge: do no-verify like commitMichael J Gruber1-0/+4
2019-07-25Merge branch 'vv/merge-squash-with-explicit-commit' into maintJunio C Hamano1-0/+2
2019-06-17Merge branch 'vv/merge-squash-with-explicit-commit'Junio C Hamano1-0/+2
2019-05-28merge: refuse --commit with --squashVishal Verma1-0/+2
2019-04-18merge: add scissors line on merge conflictDenton Liu1-2/+5
2019-04-18merge: cleanup messages like commitDenton Liu1-0/+4
2019-02-21merge-options.txt: correct wording of --no-commit optionElijah Newren1-3/+8
2018-02-16merge: allow fast-forward when merging a tracked tagJunio C Hamano1-1/+2
2017-11-06Merge branch 'wk/pull-signoff'Junio C Hamano1-0/+10
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano1-0/+6
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King1-0/+10
2017-10-12Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'W. Trevor King1-0/+6
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
2016-05-17Merge branch 'kf/gpg-sig-verification-doc'Junio C Hamano1-2/+5
2016-05-13Documentation: clarify signature verificationKeller Fuchs1-2/+5
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano1-0/+8
2014-03-31Documentation: fix misuses of "nor"Justin Lebar1-8/+7
2014-01-27Merge branch 'jc/maint-pull-docfix'Junio C Hamano1-3/+6
2014-01-14Documentation: "git pull" does not have the "-m" optionJunio C Hamano1-3/+6
2013-06-02Merge branch 'rh/merge-options-doc-fix'Junio C Hamano1-1/+2
2013-05-16Documentation/merge-options.txt: restore `-e` optionRichard Hansen1-1/+2
2013-04-05Merge branch 'sg/gpg-sig'Junio C Hamano1-0/+5
2013-03-31merge/pull Check for untrusted good GPG signaturesSebastian Götte1-2/+2
2013-03-31merge/pull: verify GPG signatures of commits being mergedSebastian Götte1-0/+5
2013-03-21Documentation: merging a tag is a special caseJunio C Hamano1-1/+2
2012-02-26Merge branch 'jc/doc-merge-options'Junio C Hamano1-11/+11
2012-02-22Documentation/merge-options.txt: group "ff" related options togetherJunio C Hamano1-11/+11
2012-01-23merge: use editor by default in interactive sessionsJunio C Hamano1-3/+13
2011-12-05Documentation: fix formatting error in merge-options.txtJack Nagel1-1/+0
2011-10-12Teach merge the '[-e|--edit]' optionJay Soffian1-0/+6
2011-02-21merge: enable progress reporting for rename detectionJeff King1-1/+9
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra1-3/+3
2010-04-13Merge branch 'maint'Junio C Hamano1-5/+5
2010-04-12Docs: Add -X option to git-merge's synopsis.Marc Branchaud1-5/+5
2010-02-24Documentation/git-pull: put verbosity options before merge/fetch onesTay Ray Chuan1-0/+2
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano1-0/+5
2010-01-17Document that merge strategies can now take their own optionsJunio C Hamano1-0/+5
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-2/+2
2009-11-10Merge branch 'bg/merge-ff-only'Junio C Hamano1-0/+5
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson1-0/+5
2009-10-22Documentation/merge-options.txt: order options in alphabetical groupsJari Aalto1-43/+45
2009-05-25merge-options.txt: Clarify merge --squashMichael J Gruber1-1/+2
2008-12-09Improve language in git-merge.txt and related docsRalf Wildenhues1-1/+1
2008-11-14Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz1-0/+8
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder1-2/+2
2008-06-08Docs: Use "-l::\n--long\n" format in OPTIONS sectionsStephan Beyer1-3/+6
2008-04-12merge, pull: add '--(no-)log' command line optionSZEDER Gábor1-0/+9
2008-04-12add 'merge.stat' config variableSZEDER Gábor1-1/+1
2008-04-12merge, pull: introduce '--(no-)stat' optionSZEDER Gábor1-2/+6
2007-09-23git-merge: add --ff and --no-ff optionsLars Hjemli1-0/+9
2007-09-23git-merge: add support for --commit and --no-squashLars Hjemli1-0/+8
2007-06-07War on whitespaceJunio C Hamano1-1/+0
2007-05-24Add a configuration option to control diffstat after mergeAlex Riesen1-0/+4
2006-06-24git-merge --squashJunio C Hamano1-0/+8
2005-12-08Documentation: recursive is the default strategy these days.Junio C Hamano1-1/+1
2005-11-06Refactored merge options into separate merge-options.txt.Jon Loeliger1-0/+16
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-06 12:56:26 +0000