summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
AgeCommit message (Expand)Author
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