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>

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index c3e4f12c44e95c5afa488fe4d69ab29b85b48448..c66c565bbe3d0e25ded50786e5503b749ad72163 100644 (file)
--- 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>...]
         [--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
 -----------
 
 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.
 
        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
 -r::
 --resolved::
        After a patch failure (e.g. attempting to apply

diff --git a/git-am.sh b/git-am.sh
index c8b9cbb101f1319b6efd78ff6ae9c63efcdc991b..3c08d53161faa72744ab64a1391d85cf9243f006 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -25,7 +25,8 @@ p=              pass it through git-apply
 patch-format=   format the patch(es) are in
 reject          pass it through git-apply
 resolvemsg=     override error message when patch failure occurs
 patch-format=   format the patch(es) are in
 reject          pass it through git-apply
 resolvemsg=     override error message when patch failure occurs

-r,resolved      to be used after a patch failure
+continue        continue applying patches after resolving a conflict
+r,resolved      synonyms for --continue

 skip            skip the current patch
 abort           restore the original branch and abort the patching operation.
 committer-date-is-author-date    lie about committer date
 skip            skip the current patch
 abort           restore the original branch and abort the patching operation.
 committer-date-is-author-date    lie about committer date


@@ -318,7 +319,7 @@ do
                scissors=t ;;
        --no-scissors)
                scissors=f ;;
                scissors=t ;;
        --no-scissors)
                scissors=f ;;

-       -r|--resolved)
+       -r|--resolved|--continue)

                resolved=t ;;
        --skip)
                skip=t ;;
                resolved=t ;;
        --skip)
                skip=t ;;