summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorKevin Bracey <kevin@bracey.fi>2013-06-26 20:06:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-27 16:37:12 (GMT)
commit8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (patch)
treeeac0b847a1a57ec6faec225feed4fd76452d0685 /Documentation/git-am.txt
parent85318f521f6c0b9843d6da12abf67f2de7608431 (diff)
downloadgit-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.zip
git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.gz
git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.bz2
am: replace uses of --resolved with --continue
git am was previously modified to provide --continue for consistency with rebase, merge etc, and the documentation changed to showing --continue as the primary form. Complete the work by replacing remaining uses of --resolved by --continue, most notably in suggested command reminders. Signed-off-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 5bbe7b6..54d8461 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -132,7 +132,7 @@ default. You can use `--no-utf8` to override this.
--resolvemsg=<msg>::
When a patch failure occurs, <msg> will be printed
to the screen before exiting. This overrides the
- standard message informing you to use `--resolved`
+ standard message informing you to use `--continue`
or `--skip` to handle the failure. This is solely
for internal use between 'git rebase' and 'git am'.
@@ -176,7 +176,7 @@ aborts in the middle. You can recover from this in one of two ways:
. hand resolve the conflict in the working directory, and update
the index file to bring it into a state that the patch should
- have produced. Then run the command with the '--resolved' option.
+ have produced. Then run the command with the '--continue' option.
The command refuses to process new mailboxes until the current
operation is finished, so if you decide to start over from scratch,