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

57 Commits (dc347195ccfbc87b6e445f5c31a5500e1df6c9b5)

Author SHA1 Message Date
Theodore Ts'o 20fa04ea6b mergetool: Replace use of "echo -n" with printf(1) to be more portable
18 years ago
Theodore Ts'o d6678c28e3 mergetool: print an appropriate warning if merge.tool is unknown
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