diff options
| author | Kevin Bracey <kevin@bracey.fi> | 2013-06-26 20:06:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 16:37:12 (GMT) |
| commit | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (patch) | |
| tree | eac0b847a1a57ec6faec225feed4fd76452d0685 /Documentation/user-manual.txt | |
| parent | 85318f521f6c0b9843d6da12abf67f2de7608431 (diff) | |
| download | git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.zip git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.gz git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.bz2 | |
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 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 644acce..faa7251 100644 --- 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 ------------------------------------------------- -$ git am --resolved +$ git am --continue ------------------------------------------------- and Git will create the commit for you and continue applying the |