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>

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 5bbe7b6d10de652658871048329c5dd60f1e12e0..54d8461d61b2f2ad5dbf5ce8c9106534d1a74289 100644 (file)
--- 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
 --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'.
 
        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
 
 . 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,
 
 The command refuses to process new mailboxes until the current
 operation is finished, so if you decide to start over from scratch,

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 644acce079df81ecd7c2cf8774b3e7fcba9c49d5..faa7251c11d8745b7a646a9bf6a13200fe598ddf 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1835,7 +1835,7 @@ Once the index is updated with the results of the conflict
 resolution, instead of creating a new commit, just run
 
 -------------------------------------------------
 resolution, instead of creating a new commit, just run
 
 -------------------------------------------------

-$ git am --resolved
+$ git am --continue

 -------------------------------------------------
 
 and Git will create the commit for you and continue applying the
 -------------------------------------------------
 
 and Git will create the commit for you and continue applying the

diff --git a/git-am.sh b/git-am.sh
index 9f4450916cd28578002d04a45b4e28e09cca738c..7ea40fe6449b665713a8272f125936edf632189b 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -6,7 +6,7 @@ SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
 git am [options] [(<mbox>|<Maildir>)...]
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
 git am [options] [(<mbox>|<Maildir>)...]

-git am [options] (--resolved | --skip | --abort)
+git am [options] (--continue | --skip | --abort)

 --
 i,interactive   run interactively
 b,binary*       (historical option -- no-op)
 --
 i,interactive   run interactively
 b,binary*       (historical option -- no-op)


@@ -102,7 +102,7 @@ stop_here_user_resolve () {
            printf '%s\n' "$resolvemsg"
            stop_here $1
     fi
            printf '%s\n' "$resolvemsg"
            stop_here $1
     fi

-    eval_gettextln "When you have resolved this problem, run \"\$cmdline --resolved\".
+    eval_gettextln "When you have resolved this problem, run \"\$cmdline --continue\".

 If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
 To restore the original branch and stop patching, run \"\$cmdline --abort\"."
 
 If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
 To restore the original branch and stop patching, run \"\$cmdline --abort\"."
 


@@ -523,7 +523,7 @@ Use \"git am --abort\" to remove it.")"
                esac
        fi
 
                esac
        fi
 

-       # Make sure we are not given --skip, --resolved, nor --abort
+       # Make sure we are not given --skip, --continue, nor --abort

        test "$skip$resolved$abort" = "" ||
                die "$(gettext "Resolve operation not in progress, we are not resuming.")"
 
        test "$skip$resolved$abort" = "" ||
                die "$(gettext "Resolve operation not in progress, we are not resuming.")"
 


@@ -670,7 +670,7 @@ do
        #  - patch is the patch body.
        #
        # When we are resuming, these files are either already prepared
        #  - patch is the patch body.
        #
        # When we are resuming, these files are either already prepared

-       # by the user, or the user can tell us to do so by --resolved flag.
+       # by the user, or the user can tell us to do so by --continue flag.

        case "$resume" in
        '')
                if test -f "$dotest/rebasing"
        case "$resume" in
        '')
                if test -f "$dotest/rebasing"

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 4f09beca90ec18c9e541f1f880471f9f2de0de8a..bd8aab0a5c4f47f76d08712d406eae4efa6adae5 100755 (executable)
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -510,7 +510,7 @@ test_expect_success 'status in an am session: file already exists' '
        cat >expected <<-\EOF &&
        # On branch am_already_exists
        # You are in the middle of an am session.
        cat >expected <<-\EOF &&
        # On branch am_already_exists
        # You are in the middle of an am session.

-       #   (fix conflicts and then run "git am --resolved")
+       #   (fix conflicts and then run "git am --continue")

        #   (use "git am --skip" to skip this patch)
        #   (use "git am --abort" to restore the original branch)
        #
        #   (use "git am --skip" to skip this patch)
        #   (use "git am --abort" to restore the original branch)
        #


@@ -532,7 +532,7 @@ test_expect_success 'status in an am session: file does not exist' '
        cat >expected <<-\EOF &&
        # On branch am_not_exists
        # You are in the middle of an am session.
        cat >expected <<-\EOF &&
        # On branch am_not_exists
        # You are in the middle of an am session.

-       #   (fix conflicts and then run "git am --resolved")
+       #   (fix conflicts and then run "git am --continue")

        #   (use "git am --skip" to skip this patch)
        #   (use "git am --abort" to restore the original branch)
        #
        #   (use "git am --skip" to skip this patch)
        #   (use "git am --abort" to restore the original branch)
        #

diff --git a/wt-status.c b/wt-status.c
index 438a40d63739d9397829e83d7af241054f729235..b191c65382b0714978fe1a6351639ed746db099f 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -826,7 +826,7 @@ static void show_am_in_progress(struct wt_status *s,
        if (advice_status_hints) {
                if (!state->am_empty_patch)
                        status_printf_ln(s, color,
        if (advice_status_hints) {
                if (!state->am_empty_patch)
                        status_printf_ln(s, color,

-                               _("  (fix conflicts and then run \"git am --resolved\")"));
+                               _("  (fix conflicts and then run \"git am --continue\")"));

                status_printf_ln(s, color,
                        _("  (use \"git am --skip\" to skip this patch)"));
                status_printf_ln(s, color,
                status_printf_ln(s, color,
                        _("  (use \"git am --skip\" to skip this patch)"));
                status_printf_ln(s, color,