]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 85318f5) | patch
am: replace uses of --resolved with --continue
authorKevin Bracey <kevin@bracey.fi>
Wed, 26 Jun 2013 20:06:41 +0000 (23:06 +0300)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 16:37:12 +0000 (09:37 -0700)
commit8ceb6fbd63e2b3b82bbca0139a1696955aa753c6
treeeac0b847a1a57ec6faec225feed4fd76452d0685tree | snapshot
parent85318f521f6c0b9843d6da12abf67f2de7608431commit | diff
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>
Documentation/git-am.txt diff | blob | blame | history
Documentation/user-manual.txt diff | blob | blame | history
git-am.sh diff | blob | blame | history
t/t7512-status-help.sh diff | blob | blame | history
wt-status.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.