summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
Commit message (Expand)AuthorAgeFilesLines
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-241-0/+4
* git-merge --squashJunio C Hamano2006-06-241-0/+8
* Documentation: recursive is the default strategy these days.Junio C Hamano2005-12-081-1/+1
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-061-0/+16