Re: [RFC/PATCH 2/2] Teach commit to handle CHERRY_HEAD automatically
- From
Jay Soffian <jaysoffian@gmail.com>
- Date
- Feb 15, 2011, 22:16 UTC
- Message-ID
- <AANLkTim63v+jh1KROgVwwEyBDjVdge7MOq+DUnpw0c-e@mail.gmail.com>
- In-Reply-To
- <1297805034-3512-3-git-send-email-jaysoffian@gmail.com>
On Tue, Feb 15, 2011 at 4:23 PM, Jay Soffian <jaysoffian@gmail.com> wrote:
Show 7 quoted lines
> --- a/builtin/revert.c
> +++ b/builtin/revert.c
> @@ -284,11 +284,10 @@ static void print_advice(void)
>
> advise("after resolving the conflicts, mark the corrected paths");
> advise("with 'git add <paths>' or 'git rm <paths>'");
> + advice("and commit the result with 'git commit'");Obvious typo, I amended it but apparently ran format-patch before the amend. Assuming the series is otherwise okay it'll be fixed in the re-roll with tests and SoB.
j.