| Commit message (Expand) | Author | Age |
* | Add testcase to ensure merging an early part of a branch is done properly | Miklos Vajna | 2008-10-14 |
* | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 |
* | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 |
* | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano | 2008-08-20 |
* | builtin-merge.c: Fix option parsing | Michele Ballabio | 2008-07-20 |
* | Merge branch 'sb/dashless' | Junio C Hamano | 2008-07-16 |
|\ |
|
| * | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 2008-07-13 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-07-16 |
|\ \ |
|
| * | | t7600-merge: Use test_expect_failure to test option parsing | Johannes Sixt | 2008-07-16 |
| |/ |
|
* | | reduce_heads(): protect from duplicate input | Junio C Hamano | 2008-07-14 |
* | | reduce_heads(): thinkofix | Sverre Hvammen Johansen | 2008-07-13 |
* | | Teach merge.log to "git-merge" again | Junio C Hamano | 2008-07-10 |
|/ |
|
* | 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 |