summaryrefslogtreecommitdiff
path: root/t/t7607-merge-overwrite.sh
AgeCommit message (Expand)AuthorFilesLines
2016-07-13Merge branch 'ah/unpack-trees-advice-messages'Libravatar Junio C Hamano1-1/+1
2016-06-27unpack-trees: fix English grammar in do-this-before-that messagesLibravatar Alex Henrie1-1/+1
2016-06-17tests: unpack-trees: update to use test_i18n* functionsLibravatar Vasco Almeida1-1/+1
2013-06-07tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)Libravatar Johannes Sixt1-3/+2
2012-04-15merge overwrites unstaged changes in renamed fileLibravatar Clemens Buchacher1-0/+9
2011-09-21unpack-trees: print "Aborting" to stderrLibravatar Michael J Gruber1-0/+1
2011-04-14i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Libravatar Junio C Hamano1-5/+2
2011-04-01Merge branch 'ab/i18n-st'Libravatar Junio C Hamano1-2/+8
2011-03-25merge: merge unborn index before setting refLibravatar Jeff King1-0/+4
2011-03-25t7607: clean up stray untracked fileLibravatar Jeff King1-1/+2
2011-03-25t7607: mark known breakage in test 11 as fixedLibravatar Jeff King1-1/+1
2011-03-09i18n: git-merge basic messagesLibravatar Ævar Arnfjörð Bjarmason1-2/+8
2011-02-09Merge branch 'tr/merge-unborn-clobber'Libravatar Junio C Hamano1-0/+16
2010-11-29Merge branch 'cb/leading-path-removal'Libravatar Junio C Hamano1-23/+79
2010-11-24Merge branch 'cb/maint-orphan-merge-noclobber'Libravatar Junio C Hamano1-0/+16
2010-11-15use persistent memory for rejected pathsLibravatar Clemens Buchacher1-3/+16
2010-11-15do not overwrite untracked during merge from unborn branchLibravatar Clemens Buchacher1-0/+16
2010-10-13do not overwrite files in leading pathLibravatar Clemens Buchacher1-1/+1
2010-10-13t7607: add leading-path testsLibravatar Clemens Buchacher1-0/+51
2010-10-13t7607: use test-lib functions and check MERGE_HEADLibravatar Clemens Buchacher1-23/+15
2010-08-25Exhibit merge bug that clobbers index&WTLibravatar Thomas Rast1-0/+16
2010-07-20Convert "! git" to "test_must_fail git"Libravatar Jared Hance1-6/+6
2008-12-15merge-recursive: do not clobber untracked working tree garbageLibravatar Junio C Hamano1-1/+1
2008-12-15modify/delete conflict resolution overwrites untracked fileLibravatar Clemens Buchacher1-0/+87
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 17:28:22 +0000