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
/
t7405-submodule-merge.sh
Age
Commit message (
Expand
)
Author
2019-05-14
tests: add a special setup where prerequisites fail
Ævar Arnfjörð Bjarmason
2018-07-11
t7405: verify 'merge --abort' works after submodule/path conflicts
Elijah Newren
2018-07-11
t7405: add a directory/submodule conflict
Elijah Newren
2018-07-11
t7405: add a file/submodule conflict
Elijah Newren
2017-10-07
tests: fix diff order arguments in test_cmp
Stefan Beller
2011-10-13
submodule: Search for merges only at end of recursive merge
Brad King
2011-10-13
submodule: Demonstrate known breakage during recursive merge
Brad King
2011-03-31
submodule: process conflicting submodules only once
Nicolas Morey-Chaisemartin
2010-09-03
t7405: cd inside subshell instead of around
Jens Lehmann
2010-07-07
Implement automatic fast-forward merge for submodules
Heiko Voigt
2010-07-07
add missing && to submodule-merge testcase
Heiko Voigt
2009-04-30
merge-recursive: do not die on a conflicting submodule
Junio C Hamano
2009-04-05
update cache for conflicting submodule entries
Clemens Buchacher
2009-04-05
add tests for merging with submodules
Clemens Buchacher