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