summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2007-05-20 00:10:13 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-25 04:36:53 (GMT)
commitd45cc6e2670bbfecb16c608a2bb0e3f358a9ece7 (patch)
tree0bc0710ecaed87129eaf8dd9af0c07c972935c98 /Documentation/git-am.txt
parent18bece43675ea0dc9022a7868865e02808b7af7f (diff)
downloadgit-d45cc6e2670bbfecb16c608a2bb0e3f358a9ece7.zip
git-d45cc6e2670bbfecb16c608a2bb0e3f358a9ece7.tar.gz
git-d45cc6e2670bbfecb16c608a2bb0e3f358a9ece7.tar.bz2
git-applymbox: Remove command
I believe noone uses git-applymbox, and noone definitely should, since it is supposed to be completely superseded and everything by its younger cousin git-am. The only known person in the universe to use it was Linus and he declared some time ago that he will try to use git-am instead in his famous dotest script. The trouble is that git-applymbox existence creates confusing UI. I'm a bit like a recycled newbie to the git porcelain and *I* was confused by git-applymbox primitiveness until I've realized a while later that I'm of course using the wrong command. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 25cf84a..049e46f 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -128,8 +128,7 @@ is terminated before the first occurrence of such a line.
When initially invoking it, you give it names of the mailboxes
to crunch. Upon seeing the first patch that does not apply, it
-aborts in the middle, just like 'git-applymbox' does. You can
-recover from this in one of two ways:
+aborts in the middle,. You can recover from this in one of two ways:
. skip the current patch by re-running the command with '--skip'
option.
@@ -146,7 +145,7 @@ names.
SEE ALSO
--------
-gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
+gitlink:git-applypatch[1], gitlink:git-apply[1].
Author