summaryrefslogtreecommitdiff
path: root/Documentation/git-sh-setup.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-03-14 01:13:39 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-14 01:13:39 -0700
commit4739cea5668bc398600197d2a4a425119c8dc322 (patch)
tree9a524615da77dd7cb97dc42afbb28ddbfeeb7ff6 /Documentation/git-sh-setup.txt
parentgit-svn: add -l/--local command to "git svn rebase" (diff)
parentAdd git-mergetool to run an appropriate merge conflict resolution program (diff)
downloadtgif-4739cea5668bc398600197d2a4a425119c8dc322.tar.xz
Merge branch 'master' of git://repo.or.cz/git/mergetool
* 'master' of git://repo.or.cz/git/mergetool: Add git-mergetool to run an appropriate merge conflict resolution program
Diffstat (limited to 'Documentation/git-sh-setup.txt')
0 files changed, 0 insertions, 0 deletions