summaryrefslogtreecommitdiff
path: root/t/t7607-merge-overwrite.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ah/unpack-trees-advice-messages'Junio C Hamano2016-07-131-1/+1
|\
| * unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messagesAlex Henrie2016-06-271-1/+1
* | tests: unpack-trees: update to use test_i18n* functionsVasco Almeida2016-06-171-1/+1
|/
* tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)Johannes Sixt2013-06-071-3/+2
* merge overwrites unstaged changes in renamed fileClemens Buchacher2012-04-151-0/+9
* unpack-trees: print "Aborting" to stderrMichael J Gruber2011-09-211-0/+1
* i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-141-5/+2
* Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-2/+8
|\
| * i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason2011-03-091-2/+8
* | merge: merge unborn index before setting refJeff King2011-03-251-0/+4
* | t7607: clean up stray untracked fileJeff King2011-03-251-1/+2
* | t7607: mark known breakage in test 11 as fixedJeff King2011-03-251-1/+1
|/
* Merge branch 'tr/merge-unborn-clobber'Junio C Hamano2011-02-091-0/+16
|\
| * Exhibit merge bug that clobbers index&WTThomas Rast2010-08-251-0/+16
* | Merge branch 'cb/leading-path-removal'Junio C Hamano2010-11-291-23/+79
|\ \
| * | use persistent memory for rejected pathsClemens Buchacher2010-11-151-3/+16
| * | do not overwrite files in leading pathClemens Buchacher2010-10-131-1/+1
| * | t7607: add leading-path testsClemens Buchacher2010-10-131-0/+51
| * | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-10-131-23/+15
* | | Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-241-0/+16
|\ \ \ | |/ / |/| |
| * | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-151-0/+16
| |/
* | Convert "! git" to "test_must_fail git"Jared Hance2010-07-201-6/+6
|/
* merge-recursive: do not clobber untracked working tree garbageJunio C Hamano2008-12-151-1/+1
* modify/delete conflict resolution overwrites untracked fileClemens Buchacher2008-12-151-0/+87