| commit | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 | |
| author | Kevin Bracey <kevin@bracey.fi> | |
| Wed, 26 Jun 2013 20:06:41 +0000 (26 23:06 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 16:37:12 +0000 (27 09:37 -0700) | ||
| tree | eac0b847a1a57ec6faec225feed4fd76452d0685 | treesnapshot (tar.gz zip) |
| parent | 85318f521f6c0b9843d6da12abf67f2de7608431 | commitdiff |
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>
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>