Commit message (Expand) | Author | Age | |
---|---|---|---|
* | t7600-merge: Use test_expect_failure to test option parsing | Johannes Sixt | 2008-07-16 |
* | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 2008-04-12 |
* | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 2008-04-12 |
* | add test_cmp function for test scripts | Jeff King | 2008-03-13 |
* | remove use of "tail -n 1" and "tail -1" | Jeff King | 2008-03-13 |
* | grep portability fix: don't use "-e" or "-q" | Jeff King | 2008-03-13 |
* | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options | Gerrit Pape | 2008-03-03 |
* | t/t7600: avoid GNUism in grep | Junio C Hamano | 2008-01-05 |
* | 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 |
* | git-merge: add support for branch.<name>.mergeoptions | Lars Hjemli | 2007-09-23 |
* | Add test-script for git-merge porcelain | Lars Hjemli | 2007-09-23 |