summaryrefslogtreecommitdiffstats
path: root/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-06-03 08:40:14 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-06-03 08:40:14 +0000
commit38b693c01c9994bafe01485f12cd3d2aebade5dd (patch)
tree0c90375adee306c5b6e5fed107ce2efb4f6bbaf2 /git-am.txt
parent679d22d20cf456c6384e077487dea82d623b8441 (diff)
downloadgit-htmldocs-38b693c01c9994bafe01485f12cd3d2aebade5dd.tar.gz
Autogenerated HTML docs for v1.5.2.1-111-gc94b
Diffstat (limited to 'git-am.txt')
-rw-r--r--git-am.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/git-am.txt b/git-am.txt
index f78e5dc28..f3387f5d0 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -127,8 +127,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.
@@ -145,7 +144,7 @@ names.
SEE ALSO
--------
-gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
+gitlink:git-apply[1].
Author