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

4 Commits (645833b564f585a25acd75c878ffda752909c273)

Author SHA1 Message Date
Arjen Laarhoven e4e92b3f4b Document 'opendiff' value in config.txt and git-mergetool.txt
18 years ago
Theodore Ts'o e15b484f6a Fix minor formatting issue in man page for git-mergetool
18 years ago
James Bowes 9cec65399d mergetool: Add support for vimdiff.
18 years ago
Theodore Ts'o c4b4a5af16 Add git-mergetool to run an appropriate merge conflict resolution program
18 years ago