Sign in
googlers
/
jrn
/
git
/
090d1e84771bb4a310e3fe8291ec71b0ddb03d4f
/
t
/
t7607-merge-overwrite.sh
64b1abe
merge-recursive: fix overwriting dirty files involved in renames
by Elijah Newren
· 7 years ago
8b026ed
Revert "Merge branch 'en/rename-directory-detection'"
by Junio C Hamano
· 7 years ago
e0052f4
merge-recursive: fix overwriting dirty files involved in renames
by Elijah Newren
· 7 years ago
7c5585f
Tighten and correct a few testcases for merging and cherry-picking
by Elijah Newren
· 7 years ago
67166a8
Merge branch 'ah/unpack-trees-advice-messages'
by Junio C Hamano
· 9 years ago
c2691e2
unpack-trees: fix English grammar in do-this-before-that messages
by Alex Henrie
· 9 years ago
e5c1272
tests: unpack-trees: update to use test_i18n* functions
by Vasco Almeida
· 9 years ago
889c6f0
tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
by Johannes Sixt
· 12 years ago
30fd3a5
merge overwrites unstaged changes in renamed file
by Clemens Buchacher
· 13 years ago
6f90969
unpack-trees: print "Aborting" to stderr
by Michael J Gruber
· 13 years ago
c9ea118
i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
by Junio C Hamano
· 14 years ago
6c80cd2
Merge branch 'ab/i18n-st'
by Junio C Hamano
· 14 years ago
97b1b4f
merge: merge unborn index before setting ref
by Jeff King
· 14 years ago
d6d9e76
t7607: clean up stray untracked file
by Jeff King
· 14 years ago
8523d07
t7607: mark known breakage in test 11 as fixed
by Jeff King
· 14 years ago
bacec47
i18n: git-merge basic messages
by Ævar Arnfjörð Bjarmason
· 14 years ago
1a9fe45
Merge branch 'tr/merge-unborn-clobber'
by Junio C Hamano
· 14 years ago
208247a
Merge branch 'cb/leading-path-removal'
by Junio C Hamano
· 14 years ago
7d43de9
Merge branch 'cb/maint-orphan-merge-noclobber'
by Junio C Hamano
· 14 years ago
7980872
use persistent memory for rejected paths
by Clemens Buchacher
· 14 years ago
172b642
do not overwrite untracked during merge from unborn branch
by Clemens Buchacher
· 14 years ago
f66caaf
do not overwrite files in leading path
by Clemens Buchacher
· 14 years ago
189645c
t7607: add leading-path tests
by Clemens Buchacher
· 14 years ago
52a0a1b
t7607: use test-lib functions and check MERGE_HEAD
by Clemens Buchacher
· 14 years ago
5b32708
Exhibit merge bug that clobbers index&WT
by Thomas Rast
· 15 years ago
ce14e0b
Convert "! git" to "test_must_fail git"
by Jared Hance
· 15 years ago
c5ab03f
merge-recursive: do not clobber untracked working tree garbage
by Junio C Hamano
· 16 years ago
7bb1fcc
modify/delete conflict resolution overwrites untracked file
by Clemens Buchacher
· 16 years ago