summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
AgeCommit message (Expand)AuthorFilesLines
2006-06-24git-merge --squashLibravatar Junio C Hamano1-0/+8
2005-12-08Documentation: recursive is the default strategy these days.Libravatar Junio C Hamano1-1/+1
2005-11-06Refactored merge options into separate merge-options.txt.Libravatar Jon Loeliger1-0/+16