Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2008-03-03 | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options | Gerrit Pape | 1 | -0/+6 |
2008-01-05 | t/t7600: avoid GNUism in grep | Junio C Hamano | 1 | -2/+2 |
2007-09-23 | git-merge: add --ff and --no-ff options | Lars Hjemli | 1 | -0/+20 |
2007-09-23 | git-merge: add support for --commit and --no-squash | Lars Hjemli | 1 | -0/+22 |
2007-09-23 | git-merge: add support for branch.<name>.mergeoptions | Lars Hjemli | 1 | -0/+54 |
2007-09-23 | Add test-script for git-merge porcelain | Lars Hjemli | 1 | -0/+344 |