| Commit message (Expand) | Author | Age | Files | Lines |
* | tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) | Johannes Sixt | 2013-06-07 | 1 | -3/+2 |
* | merge overwrites unstaged changes in renamed file | Clemens Buchacher | 2012-04-15 | 1 | -0/+9 |
* | unpack-trees: print "Aborting" to stderr | Michael J Gruber | 2011-09-21 | 1 | -0/+1 |
* | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 | Junio C Hamano | 2011-04-14 | 1 | -5/+2 |
* | Merge branch 'ab/i18n-st' | Junio C Hamano | 2011-04-01 | 1 | -2/+8 |
|\ |
|
| * | i18n: git-merge basic messages | Ævar Arnfjörð Bjarmason | 2011-03-09 | 1 | -2/+8 |
* | | merge: merge unborn index before setting ref | Jeff King | 2011-03-25 | 1 | -0/+4 |
* | | t7607: clean up stray untracked file | Jeff King | 2011-03-25 | 1 | -1/+2 |
* | | t7607: mark known breakage in test 11 as fixed | Jeff King | 2011-03-25 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'tr/merge-unborn-clobber' | Junio C Hamano | 2011-02-09 | 1 | -0/+16 |
|\ |
|
| * | Exhibit merge bug that clobbers index&WT | Thomas Rast | 2010-08-25 | 1 | -0/+16 |
* | | Merge branch 'cb/leading-path-removal' | Junio C Hamano | 2010-11-29 | 1 | -23/+79 |
|\ \ |
|
| * | | use persistent memory for rejected paths | Clemens Buchacher | 2010-11-15 | 1 | -3/+16 |
| * | | do not overwrite files in leading path | Clemens Buchacher | 2010-10-13 | 1 | -1/+1 |
| * | | t7607: add leading-path tests | Clemens Buchacher | 2010-10-13 | 1 | -0/+51 |
| * | | t7607: use test-lib functions and check MERGE_HEAD | Clemens Buchacher | 2010-10-13 | 1 | -23/+15 |
* | | | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 2010-11-24 | 1 | -0/+16 |
|\ \ \
| |/ /
|/| | |
|
| * | | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 | 1 | -0/+16 |
| |/ |
|
* | | Convert "! git" to "test_must_fail git" | Jared Hance | 2010-07-20 | 1 | -6/+6 |
|/ |
|
* | merge-recursive: do not clobber untracked working tree garbage | Junio C Hamano | 2008-12-15 | 1 | -1/+1 |
* | modify/delete conflict resolution overwrites untracked file | Clemens Buchacher | 2008-12-15 | 1 | -0/+87 |