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>
Jeff King committed
Feb 11, 2010 at 17:27 UTC
c8089af6c6754153d75de74d0f147adcd46a6b59
2 files changed
+5
-3
Documentation/git-am.txt
+2
-1
@@ -15,7 +15,7 @@ SYNOPSIS
15
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
16
[--reject] [-q | --quiet] [--scissors | --no-scissors]
17
[<mbox> | <Maildir>...]
18
-'git am' (--skip | --resolved | --abort)
18
+'git am' (--continue | --skip | --abort)
19
20
DESCRIPTION
21
-----------
@@ -107,6 +107,7 @@ default. You can use `--no-utf8` to override this.
107
Skip the current patch. This is only meaningful when
108
restarting an aborted patch.
109
110
+--continue::
111
-r::
112
--resolved::
113
After a patch failure (e.g. attempting to apply
git-am.sh
+3
-2
@@ -25,7 +25,8 @@ p= pass it through git-apply
25
patch-format= format the patch(es) are in
26
reject pass it through git-apply
27
resolvemsg= override error message when patch failure occurs
28
-r,resolved to be used after a patch failure
28
+continue continue applying patches after resolving a conflict
29
+r,resolved synonyms for --continue
30
skip skip the current patch
31
abort restore the original branch and abort the patching operation.
32
committer-date-is-author-date lie about committer date
@@ -318,7 +319,7 @@ do
319
scissors=t ;;
320
--no-scissors)
321
scissors=f ;;
321
- -r|--resolved)
322
+ -r|--resolved|--continue)
323
resolved=t ;;
324
--skip)
325
skip=t ;;