Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t7607-merge-overwrite.sh
Age
Commit message (
Expand
)
Author
2018-05-08
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren
2018-04-11
Revert "Merge branch 'en/rename-directory-detection'"
Junio C Hamano
2018-02-28
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren
2018-01-20
Tighten and correct a few testcases for merging and cherry-picking
Elijah Newren
2016-07-13
Merge branch 'ah/unpack-trees-advice-messages'
Junio C Hamano
2016-06-27
unpack-trees: fix English grammar in do-this-before-that messages
Alex Henrie
2016-06-18
tests: unpack-trees: update to use test_i18n* functions
Vasco Almeida
2013-06-08
tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
Johannes Sixt
2012-04-16
merge overwrites unstaged changes in renamed file
Clemens Buchacher
2011-09-22
unpack-trees: print "Aborting" to stderr
Michael J Gruber
2011-04-15
i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
Junio C Hamano
2011-04-02
Merge branch 'ab/i18n-st'
Junio C Hamano
2011-03-26
merge: merge unborn index before setting ref
Jeff King
2011-03-26
t7607: clean up stray untracked file
Jeff King
2011-03-26
t7607: mark known breakage in test 11 as fixed
Jeff King
2011-03-10
i18n: git-merge basic messages
Ævar Arnfjörð Bjarmason
2011-02-10
Merge branch 'tr/merge-unborn-clobber'
Junio C Hamano
2010-11-30
Merge branch 'cb/leading-path-removal'
Junio C Hamano
2010-11-25
Merge branch 'cb/maint-orphan-merge-noclobber'
Junio C Hamano
2010-11-16
use persistent memory for rejected paths
Clemens Buchacher
2010-11-15
do not overwrite untracked during merge from unborn branch
Clemens Buchacher
2010-10-14
do not overwrite files in leading path
Clemens Buchacher
2010-10-14
t7607: add leading-path tests
Clemens Buchacher
2010-10-14
t7607: use test-lib functions and check MERGE_HEAD
Clemens Buchacher
2010-08-25
Exhibit merge bug that clobbers index&WT
Thomas Rast
2010-07-21
Convert "! git" to "test_must_fail git"
Jared Hance
2008-12-15
merge-recursive: do not clobber untracked working tree garbage
Junio C Hamano
2008-12-15
modify/delete conflict resolution overwrites untracked file
Clemens Buchacher