Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2008-07-10 | Teach merge.log to "git-merge" again | 1 | -0/+7 | |
2008-04-12 | merge, pull: add '--(no-)log' command line option | 1 | -1/+15 | |
2008-04-12 | merge, pull: introduce '--(no-)stat' option | 1 | -4/+19 | |
2008-03-13 | add test_cmp function for test scripts | 1 | -1/+1 | |
2008-03-13 | remove use of "tail -n 1" and "tail -1" | 1 | -1/+1 | |
2008-03-13 | grep portability fix: don't use "-e" or "-q" | 1 | -2/+2 | |
2008-03-03 | git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options | 1 | -0/+6 | |
2008-01-05 | t/t7600: avoid GNUism in grep | 1 | -2/+2 | |
2007-09-23 | git-merge: add --ff and --no-ff options | 1 | -0/+20 | |
2007-09-23 | git-merge: add support for --commit and --no-squash | 1 | -0/+22 | |
2007-09-23 | git-merge: add support for branch.<name>.mergeoptions | 1 | -0/+54 | |
2007-09-23 | Add test-script for git-merge porcelain | 1 | -0/+344 |