| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 | 1 | -0/+9 |
| * | add 'merge.stat' config variable | SZEDER Gábor | 2008-04-12 | 1 | -1/+1 |
| * | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 | 1 | -2/+6 |
| * | git-merge: add --ff and --no-ff options | Lars Hjemli | 2007-09-23 | 1 | -0/+9 |
| * | git-merge: add support for --commit and --no-squash | Lars Hjemli | 2007-09-23 | 1 | -0/+8 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 | 1 | -1/+0 |
| * | Add a configuration option to control diffstat after merge | Alex Riesen | 2007-05-24 | 1 | -0/+4 |
| * | git-merge --squash | Junio C Hamano | 2006-06-24 | 1 | -0/+8 |
| * | Documentation: recursive is the default strategy these days. | Junio C Hamano | 2005-12-08 | 1 | -1/+1 |
| * | Refactored merge options into separate merge-options.txt. | Jon Loeliger | 2005-11-06 | 1 | -0/+16 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |