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>
Kevin Bracey committed
Jun 26, 2013 at 23:06 UTC
8ceb6fbd63e2b3b82bbca0139a1696955aa753c6
5 files changed
+10
-10
Documentation/git-am.txt
+2
-2
@@ -132,7 +132,7 @@ default. You can use `--no-utf8` to override this.
132
--resolvemsg=<msg>::
133
When a patch failure occurs, <msg> will be printed
134
to the screen before exiting. This overrides the
135
- standard message informing you to use `--resolved`
135
+ standard message informing you to use `--continue`
136
or `--skip` to handle the failure. This is solely
137
for internal use between 'git rebase' and 'git am'.
138
@@ -176,7 +176,7 @@ aborts in the middle. You can recover from this in one of two ways:
176
177
. hand resolve the conflict in the working directory, and update
178
the index file to bring it into a state that the patch should
179
- have produced. Then run the command with the '--resolved' option.
179
+ have produced. Then run the command with the '--continue' option.
180
181
The command refuses to process new mailboxes until the current
182
operation is finished, so if you decide to start over from scratch,
Documentation/user-manual.txt
+1
-1
@@ -1835,7 +1835,7 @@ Once the index is updated with the results of the conflict
1835
resolution, instead of creating a new commit, just run
1836
1837
-------------------------------------------------
1838
-$ git am --resolved
1838
+$ git am --continue
1839
-------------------------------------------------
1840
1841
and Git will create the commit for you and continue applying the
git-am.sh
+4
-4
@@ -6,7 +6,7 @@ SUBDIRECTORY_OK=Yes
6
OPTIONS_KEEPDASHDASH=
7
OPTIONS_SPEC="\
8
git am [options] [(<mbox>|<Maildir>)...]
9
-git am [options] (--resolved | --skip | --abort)
9
+git am [options] (--continue | --skip | --abort)
10
--
11
i,interactive run interactively
12
b,binary* (historical option -- no-op)
@@ -102,7 +102,7 @@ stop_here_user_resolve () {
102
printf '%s\n' "$resolvemsg"
103
stop_here $1
104
fi
105
- eval_gettextln "When you have resolved this problem, run \"\$cmdline --resolved\".
105
+ eval_gettextln "When you have resolved this problem, run \"\$cmdline --continue\".
106
If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
107
To restore the original branch and stop patching, run \"\$cmdline --abort\"."
108
@@ -523,7 +523,7 @@ Use \"git am --abort\" to remove it.")"
523
esac
524
fi
525
526
- # Make sure we are not given --skip, --resolved, nor --abort
526
+ # Make sure we are not given --skip, --continue, nor --abort
527
test "$skip$resolved$abort" = "" ||
528
die "$(gettext "Resolve operation not in progress, we are not resuming.")"
529
@@ -670,7 +670,7 @@ do
670
# - patch is the patch body.
671
#
672
# When we are resuming, these files are either already prepared
673
- # by the user, or the user can tell us to do so by --resolved flag.
673
+ # by the user, or the user can tell us to do so by --continue flag.
674
case "$resume" in
675
'')
676
if test -f "$dotest/rebasing"
t/t7512-status-help.sh
+2
-2
@@ -510,7 +510,7 @@ test_expect_success 'status in an am session: file already exists' '
510
cat >expected <<-\EOF &&
511
# On branch am_already_exists
512
# You are in the middle of an am session.
513
- # (fix conflicts and then run "git am --resolved")
513
+ # (fix conflicts and then run "git am --continue")
514
# (use "git am --skip" to skip this patch)
515
# (use "git am --abort" to restore the original branch)
516
#
@@ -532,7 +532,7 @@ test_expect_success 'status in an am session: file does not exist' '
532
cat >expected <<-\EOF &&
533
# On branch am_not_exists
534
# You are in the middle of an am session.
535
- # (fix conflicts and then run "git am --resolved")
535
+ # (fix conflicts and then run "git am --continue")
536
# (use "git am --skip" to skip this patch)
537
# (use "git am --abort" to restore the original branch)
538
#
wt-status.c
+1
-1
@@ -826,7 +826,7 @@ static void show_am_in_progress(struct wt_status *s,
826
if (advice_status_hints) {
827
if (!state->am_empty_patch)
828
status_printf_ln(s, color,
829
- _(" (fix conflicts and then run \"git am --resolved\")"));
829
+ _(" (fix conflicts and then run \"git am --continue\")"));
830
status_printf_ln(s, color,
831
_(" (use \"git am --skip\" to skip this patch)"));
832
status_printf_ln(s, color,