summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2010-02-11 22:27:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-12 06:10:00 (GMT)
commitc8089af6c6754153d75de74d0f147adcd46a6b59 (patch)
tree8090406f0146e1168796d05880715771ed561981 /Documentation/git-am.txt
parentf476c0b7b30b26157b4a12b565a08a3c015edf6d (diff)
downloadgit-c8089af6c6754153d75de74d0f147adcd46a6b59.zip
git-c8089af6c6754153d75de74d0f147adcd46a6b59.tar.gz
git-c8089af6c6754153d75de74d0f147adcd46a6b59.tar.bz2
am: switch --resolved to --continue
Rebase calls this same function "--continue", which means users may be trained to type it. There is no reason to deprecate --resolved (or -r), so we will keep it as a synonym. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index c3e4f12..c66c565 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -15,7 +15,7 @@ SYNOPSIS
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--reject] [-q | --quiet] [--scissors | --no-scissors]
[<mbox> | <Maildir>...]
-'git am' (--skip | --resolved | --abort)
+'git am' (--continue | --skip | --abort)
DESCRIPTION
-----------
@@ -107,6 +107,7 @@ default. You can use `--no-utf8` to override this.
Skip the current patch. This is only meaningful when
restarting an aborted patch.
+--continue::
-r::
--resolved::
After a patch failure (e.g. attempting to apply