kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
22684 Commits
6 Branches
36 Tags
131 MiB
Tree: 178b33157a
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '178b33157a'
${ noResults }
Commit Graph

4 Commits (178b33157aba98e34f641408105be54f42cbe5bc)

Author SHA1 Message Date
Heiko Voigt 420432d434 add missing && to submodule-merge testcase
15 years ago
Junio C Hamano 0c44c94309 merge-recursive: do not die on a conflicting submodule
16 years ago
Clemens Buchacher 0eb6574c24 update cache for conflicting submodule entries
16 years ago
Clemens Buchacher f37ae35e73 add tests for merging with submodules
16 years ago