projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bbdfbc4) | patch
merge-tool documentation: describe custom command usage
authorCharles Bailey <charles@hashpling.org>
Sat, 8 Mar 2008 20:47:06 +0000 (20:47 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 8 Mar 2008 21:22:55 +0000 (13:22 -0800)
commitcaa99829a24bc4decf86278c3478c88f564a795a
tree2b7641d62aab7aeeba8fd108a5d4a97dc0f20c2ftree | snapshot
parentbbdfbc4b01b38489a0c171bc70c89e017c759cdccommit | diff
merge-tool documentation: describe custom command usage

The configuration variables for custom merge tools were documented
only in config.txt but there was no reference to the functionality in
git-mergetool.txt.

Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-mergetool.txt diff | blob | history
Git—the stupid content tracker