kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38246 Commits
6 Branches
36 Tags
131 MiB
 
 
 
 
 
 
Tree: 114ff8881a
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '114ff8881a'
${ noResults }
git/mergetools
Junio C Hamano c1777a2970
Merge branch 'oc/mergetools-beyondcompare' 		10 years ago
..
araxis
…
bc mergetool: rename bc3 to bc 10 years ago
bc3 mergetool: rename bc3 to bc 10 years ago
codecompare Add Code Compare v2.80.4 as a merge / diff tool for Windows 13 years ago
deltawalker
…
diffmerge mergetools/diffmerge: support DiffMerge as a git mergetool 12 years ago
diffuse
…
ecmerge
…
emerge
…
gvimdiff mergetools: simplify how we handle "vim" and "defaults" 12 years ago
gvimdiff2 mergetools: simplify how we handle "vim" and "defaults" 12 years ago
gvimdiff3 mergetools: add vimdiff3 mode 11 years ago
kdiff3 mergetools/kdiff3: do not use --auto when diffing 12 years ago
kompare
…
meld mergetools/meld: make usage of `--output` configurable and more robust 10 years ago
opendiff
…
p4merge mergetools/p4merge: create a base if none available 12 years ago
tkdiff
…
tortoisemerge mergetools: teach tortoisemerge to handle filenames with SP correctly 12 years ago
vimdiff mergetools: add vimdiff3 mode 11 years ago
vimdiff2 mergetools: simplify how we handle "vim" and "defaults" 12 years ago
vimdiff3 mergetools: add vimdiff3 mode 11 years ago
xxdiff
…