Age | Commit message (Expand) | Author | Files | Lines |
2010-10-22 | merge -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 1 | -0/+11 |
2010-08-18 | t7600 (merge): test merge from branch yet to be born | Jonathan Nieder | 1 | -0/+21 |
2010-08-18 | t7600 (merge): check reflog entry | Jonathan Nieder | 1 | -1/+7 |
2010-08-18 | t7600 (merge): do not launch gitk for --debug | Jonathan Nieder | 1 | -29/+29 |
2010-08-18 | t7600 (merge): modernize style | Jonathan Nieder | 1 | -187/+101 |
2010-08-18 | merge: do not mistake (ancestor of) tag for branch | Jonathan Nieder | 1 | -4/+12 |
2010-04-06 | war on "sleep" in tests | Junio C Hamano | 1 | -2/+1 |
2009-10-30 | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 1 | -0/+41 |
2008-10-19 | Merge branch 'mv/merge-noff' | Junio C Hamano | 1 | -0/+16 |
2008-10-17 | Merge branch 'maint' | Junio C Hamano | 1 | -0/+24 |
2008-10-14 | Add testcase to ensure merging an early part of a branch is done properly | Miklos Vajna | 1 | -0/+26 |
2008-10-03 | builtin-commit: use reduce_heads() only when appropriate | Miklos Vajna | 1 | -0/+16 |
2008-10-03 | builtin-merge: refresh the index before calling a strategy | Miklos Vajna | 1 | -0/+9 |
2008-09-03 | Merge branch 'maint' | Junio C Hamano | 1 | -1/+1 |
2008-09-03 | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 1 | -1/+1 |
2008-08-27 | Merge branch 'mv/merge-custom' | Junio C Hamano | 1 | -0/+4 |
2008-08-23 | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 1 | -0/+9 |
2008-08-20 | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano | 1 | -0/+10 |
2008-07-29 | Add a second testcase for handling invalid strategies in git-merge | Miklos Vajna | 1 | -0/+4 |
2008-07-20 | builtin-merge.c: Fix option parsing | Michele Ballabio | 1 | -1/+1 |
2008-07-16 | Merge branch 'sb/dashless' | Junio C Hamano | 1 | -1/+1 |
2008-07-16 | Merge branch 'maint' | Junio C Hamano | 1 | -31/+7 |
2008-07-16 | t7600-merge: Use test_expect_failure to test option parsing | Johannes Sixt | 1 | -30/+6 |
2008-07-14 | reduce_heads(): protect from duplicate input | Junio C Hamano | 1 | -0/+22 |
2008-07-13 | reduce_heads(): thinkofix | Sverre Hvammen Johansen | 1 | -0/+11 |
2008-07-13 | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 1 | -1/+1 |
2008-07-10 | Teach merge.log to "git-merge" again | Junio C Hamano | 1 | -0/+7 |
2008-04-12 | merge, pull: add '--(no-)log' command line option | SZEDER Gábor | 1 | -1/+15 |
2008-04-12 | merge, pull: introduce '--(no-)stat' option | SZEDER Gábor | 1 | -4/+19 |
2008-03-13 | add test_cmp function for test scripts | Jeff King | 1 | -1/+1 |
2008-03-13 | remove use of "tail -n 1" and "tail -1" | Jeff King | 1 | -1/+1 |
2008-03-13 | grep portability fix: don't use "-e" or "-q" | Jeff King | 1 | -2/+2 |
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 |