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