Commit message (Expand) | Author | Age | |
---|---|---|---|
* | War on whitespace | Junio C Hamano | 2007-06-07 |
* | Add a configuration option to control diffstat after merge | Alex Riesen | 2007-05-24 |
* | git-merge --squash | Junio C Hamano | 2006-06-24 |
* | Documentation: recursive is the default strategy these days. | Junio C Hamano | 2005-12-08 |
* | Refactored merge options into separate merge-options.txt. | Jon Loeliger | 2005-11-06 |