Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: add git-mergetool to the command list.
author
Junio C Hamano
<junkio@cox.net>
Wed, 14 Mar 2007 08:29:26 +0000
(
01:29
-0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 14 Mar 2007 08:29:26 +0000
(
01:29
-0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/cmd-list.perl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
4739cea
)
diff --git
a/Documentation/cmd-list.perl
b/Documentation/cmd-list.perl
index f61c77aa7c360e12a3e11e9e5dd3ebecfad78d7e..b54382b2bfdfc7926af8c4b0552f82235619f1c6 100755
(executable)
--- a/
Documentation/cmd-list.perl
+++ b/
Documentation/cmd-list.perl
@@
-124,6
+124,7
@@
sub format_one {
git-merge mainporcelain
git-merge-one-file purehelpers
git-merge-tree ancillaryinterrogators
+git-mergetool ancillarymanipulators
git-mktag plumbingmanipulators
git-mktree plumbingmanipulators
git-mv mainporcelain