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

3 Commits (0cf8581e330e7140c9f5c94a53d441187c0f8ff9)

Author SHA1 Message Date
Junio C Hamano c236bcd061 git-merge-recursive: learn to honor merge.conflictstyle
17 years ago
Johannes Schindelin ef90d6d420 Provide git_config with a callback-data parameter
17 years ago
Junio C Hamano 525ab63950 merge-recursive: split low-level merge functions out.
17 years ago