summaryrefslogtreecommitdiffstats
path: root/Documentation/cmd-list.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-14 09:29:26 +0100
committerJunio C Hamano <junkio@cox.net>2007-03-14 09:29:26 +0100
commit86952cdabdcc550a20794794db539c41877d17fc (patch)
tree3ebf99169c1ddef3692d15c491c25b19f88363fb /Documentation/cmd-list.perl
parentMerge branch 'master' of git://repo.or.cz/git/mergetool (diff)
downloadgit-86952cdabdcc550a20794794db539c41877d17fc.tar.xz
git-86952cdabdcc550a20794794db539c41877d17fc.zip
Documentation: add git-mergetool to the command list.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/cmd-list.perl')
-rwxr-xr-xDocumentation/cmd-list.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl
index f61c77aa7c..b54382b2bf 100755
--- a/Documentation/cmd-list.perl
+++ b/Documentation/cmd-list.perl
@@ -124,6 +124,7 @@ git-merge-index plumbingmanipulators
git-merge mainporcelain
git-merge-one-file purehelpers
git-merge-tree ancillaryinterrogators
+git-mergetool ancillarymanipulators
git-mktag plumbingmanipulators
git-mktree plumbingmanipulators
git-mv mainporcelain