Re: [PATCH] am: replace uses of --resolved with --continue

2013-06-27 Thread John Keeping
On Wed, Jun 26, 2013 at 11:06:41PM +0300, Kevin Bracey wrote: 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

Re: [PATCH] am: replace uses of --resolved with --continue

2013-06-27 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: @@ -176,7 +176,7 @@ aborts in the middle. You can recover from this in one of two ways: . hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should - have produced. Then run

[PATCH] am: replace uses of --resolved with --continue

2013-06-26 Thread Kevin Bracey
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.