summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
AgeCommit message (Expand)Author
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
2010-02-24Documentation/git-pull: put verbosity options before merge/fetch onesTay Ray Chuan
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-18Document that merge strategies can now take their own optionsJunio C Hamano
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
2009-11-10Merge branch 'bg/merge-ff-only'Junio C Hamano
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson
2009-10-22Documentation/merge-options.txt: order options in alphabetical groupsJari Aalto
2009-05-25merge-options.txt: Clarify merge --squashMichael J Gruber
2008-12-10Improve language in git-merge.txt and related docsRalf Wildenhues
2008-11-15Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder
2008-06-08Docs: Use "-l::\n--long\n" format in OPTIONS sectionsStephan Beyer
2008-04-13merge, pull: add '--(no-)log' command line optionSZEDER Gábor
2008-04-13add 'merge.stat' config variableSZEDER Gábor
2008-04-13merge, pull: introduce '--(no-)stat' optionSZEDER Gábor
2007-09-24git-merge: add --ff and --no-ff optionsLars Hjemli
2007-09-24git-merge: add support for --commit and --no-squashLars Hjemli
2007-06-07War on whitespaceJunio C Hamano
2007-05-25Add a configuration option to control diffstat after mergeAlex Riesen
2006-06-24git-merge --squashJunio C Hamano
2005-12-08Documentation: recursive is the default strategy these days.Junio C Hamano
2005-11-07Refactored merge options into separate merge-options.txt.Jon Loeliger