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