| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jv/merge-nothing-into-void' | Junio C Hamano | 2016-04-06 | 1 | -0/+10 |
|\ |
|
| * | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-void | Junio C Hamano | 2016-03-23 | 1 | -0/+10 |
* | | Merge branch 'ss/commit-squash-msg' | Junio C Hamano | 2016-04-06 | 1 | -0/+28 |
|\ \
| |/
|/| |
|
| * | commit: do not lose SQUASH_MSG contentsss/commit-squash-msg | Sven Strickroth | 2016-03-21 | 1 | -0/+28 |
* | | Merge branch 'jk/merge-file-exit-code' | Junio C Hamano | 2015-10-30 | 1 | -0/+33 |
|\ \
| |/
|/| |
|
| * | merge-file: clamp exit code to maximum 127jk/merge-file-exit-code | Jeff King | 2015-10-29 | 1 | -0/+33 |
* | | t: fix trivial &&-chain breakage | Jeff King | 2015-03-20 | 1 | -1/+1 |
|/ |
|
* | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-merges | Max Kirillov | 2014-05-15 | 1 | -6/+5 |
* | t7600: fix typo in test titlemv/merge-ff-tristate | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |
* | merge: handle --ff/--no-ff/--ff-only as a tri-state option | Miklos Vajna | 2013-07-02 | 1 | -3/+9 |
* | Merge branch 'vl/typofix' | Junio C Hamano | 2013-06-26 | 1 | -1/+1 |
|\ |
|
| * | random typofixes (committed missing a 't', successful missing an 's') | Veres Lajos | 2013-06-19 | 1 | -1/+1 |
* | | t7600: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 | 1 | -34/+26 |
|/ |
|
* | Fix tests under GETTEXT_POISON on parseopt | Jiang Xin | 2012-08-27 | 1 | -1/+1 |
* | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fix | Junio C Hamano | 2012-02-09 | 1 | -0/+12 |
* | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-merge | Junio C Hamano | 2012-02-05 | 1 | -0/+13 |
* | merge: record tag objects without peeling in MERGE_HEAD | Junio C Hamano | 2011-11-08 | 1 | -1/+5 |
* | merge: notice local merging of tags and keep it unwrapped | Junio C Hamano | 2011-11-07 | 1 | -3/+3 |
* | Teach merge the '[-e|--edit]' option | Jay Soffian | 2011-10-12 | 1 | -0/+23 |
* | Merge branch 'mg/merge-ff-config' | Junio C Hamano | 2011-05-16 | 1 | -6/+58 |
|\ |
|
| * | tests: check git does not barf on merge.ff values for future versions of git | Jonathan Nieder | 2011-05-06 | 1 | -2/+14 |
| * | merge: introduce merge.ff configuration variable | Junio C Hamano | 2011-05-06 | 1 | -2/+41 |
| * | Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config | Junio C Hamano | 2011-05-06 | 1 | -0/+33 |
| |\ |
|
* | \ | Merge branch 'jc/maint-branch-mergeoptions' | Junio C Hamano | 2011-05-11 | 1 | -0/+32 |
|\ \ \
| | |/
| |/| |
|
| * | | merge: make branch.<name>.mergeoptions correctly override merge.<option> | Junio C Hamano | 2011-05-06 | 1 | -0/+32 |
* | | | Merge branch 'jn/maint-test-merge-verify-parents' | Junio C Hamano | 2011-05-11 | 1 | -74/+73 |
|\ \ \ |
|
| * | | | tests: teach verify_parents to check for extra parents | Jonathan Nieder | 2011-05-06 | 1 | -0/+1 |
| * | | | tests: eliminate unnecessary setup test assertions | Jonathan Nieder | 2011-05-06 | 1 | -74/+72 |
| | |/
| |/| |
|
* | | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 | Junio C Hamano | 2011-04-14 | 1 | -2/+2 |
|/ / |
|
* | | i18n: git-merge "Wonderful" message | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -1/+1 |
* | | merge -h: show usage even with corrupt index | Nguyễn Thái Ngọc Duy | 2010-10-22 | 1 | -0/+11 |
* | | t7600 (merge): test merge from branch yet to be born | Jonathan Nieder | 2010-08-18 | 1 | -0/+21 |
* | | t7600 (merge): check reflog entry | Jonathan Nieder | 2010-08-18 | 1 | -1/+7 |
* | | t7600 (merge): do not launch gitk for --debug | Jonathan Nieder | 2010-08-18 | 1 | -29/+29 |
* | | t7600 (merge): modernize style | Jonathan Nieder | 2010-08-18 | 1 | -187/+101 |
* | | merge: do not mistake (ancestor of) tag for branch | Jonathan Nieder | 2010-08-18 | 1 | -4/+12 |
* | | war on "sleep" in tests | Junio C Hamano | 2010-04-06 | 1 | -2/+1 |
|/ |
|
* | Teach 'git merge' and 'git pull' the option --ff-only | Björn Gustavsson | 2009-10-30 | 1 | -0/+41 |
* | Merge branch 'mv/merge-noff' | Junio C Hamano | 2008-10-19 | 1 | -0/+16 |
|\ |
|
| * | builtin-commit: use reduce_heads() only when appropriate | Miklos Vajna | 2008-10-03 | 1 | -0/+16 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-10-17 | 1 | -0/+24 |
|\ \ |
|
| * | | Add testcase to ensure merging an early part of a branch is done properly | Miklos Vajna | 2008-10-14 | 1 | -0/+26 |
* | | | builtin-merge: refresh the index before calling a strategy | Miklos Vajna | 2008-10-03 | 1 | -0/+9 |
| |/
|/| |
|
* | | Merge branch 'maint' | Junio C Hamano | 2008-09-03 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 | 1 | -1/+1 |
* | | Merge branch 'mv/merge-custom' | Junio C Hamano | 2008-08-27 | 1 | -0/+4 |
|\ \
| |/
|/| |
|
| * | Add a second testcase for handling invalid strategies in git-merge | Miklos Vajna | 2008-07-29 | 1 | -0/+4 |
* | | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 | 1 | -0/+9 |
* | | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano | 2008-08-20 | 1 | -0/+10 |
|/ |
|
* | builtin-merge.c: Fix option parsing | Michele Ballabio | 2008-07-20 | 1 | -1/+1 |