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