diff options
| author |  Kevin Bracey <kevin@bracey.fi> | 2013-06-26 23:06:41 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-27 09:37:12 -0700 |
| commit | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (patch) | |
| tree | eac0b847a1a57ec6faec225feed4fd76452d0685 /t | |
| parent | Update draft release notes to 1.8.4 (diff) | |
| download | tgif-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7512-status-help.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 4f09beca90..bd8aab0a5c 100755 --- 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. - # (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) # @@ -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. - # (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) # |