| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | git-merge: add --ff and --no-ff options | Lars Hjemli | 2007-09-23 |
| * | git-merge: add support for --commit and --no-squash | Lars Hjemli | 2007-09-23 |
| * | 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 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |