summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2011-04-06 18:46:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-06 22:24:10 (GMT)
commit48672b3dc70e8f70291d974f0eb54cbac7f498e0 (patch)
treec050484b8a617acc53fe9619fab23b4f21666813 /Documentation/git-rebase.txt
parent90b94c26f7ae5241aa1d17c7076c103d9896b534 (diff)
downloadgit-48672b3dc70e8f70291d974f0eb54cbac7f498e0.zip
git-48672b3dc70e8f70291d974f0eb54cbac7f498e0.tar.gz
git-48672b3dc70e8f70291d974f0eb54cbac7f498e0.tar.bz2
Documentation: Allow custom diff tools to be specified in 'diff.tool'
Apart from the list of "valid values", 'diff.tool' can take any value, provided there is a corresponding 'difftool.<tool>.cmd' option. Also, describe this option just before the 'difftool.*' options. Helped-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
0 files changed, 0 insertions, 0 deletions