Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2007-05-24 | Add a configuration option to control diffstat after merge | Alex Riesen | 1 | -0/+4 |
2006-06-24 | git-merge --squash | Junio C Hamano | 1 | -0/+8 |
2005-12-08 | Documentation: recursive is the default strategy these days. | Junio C Hamano | 1 | -1/+1 |
2005-11-06 | Refactored merge options into separate merge-options.txt. | Jon Loeliger | 1 | -0/+16 |