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

3 Commits (d599e0484f8ebac8cc50e9557a4c3d246826843d)

Author SHA1 Message Date
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