Re: [PATCH v8 5/7] revision: mark non-user-given objects instead

From: Matthew DeVore <matvore@google.com>
Date: Sep 14, 2018, 20:08 UTC
Message-ID: <CAMfpvhLkn1wbDwzQycW4SX92qmyof6n3gMXe-f-5JdQKk4P28g@mail.gmail.com>
In-Reply-To: <xmqqzhwkat8i.fsf@gitster-ct.c.googlers.com>

On Fri, Sep 14, 2018 at 10:23 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

>
> Matthew DeVore <matvore@google.com> writes:
>
> > Signed-off-by: Matthew DeVore <matvore@google.com>
> >
> > fixup of 6defd70de
>
> That's probably meant to go below "---".
>

That line shouldn't be there at all, sorry!

It came from me putting that text in a commit which was meant to be a fixup of another commit when I ran rebase -i. I asked rebase to make it a "squash" so I could edit the commit message of the earlier commit (6defd70de). Then rebase merged the two descriptions and let me edit them, but I didn't remember to delete the latter commit's message.

I probably should have made the earlier commit (6defd70de) a "reword", and the later commit a "fixup", rather than "pick" followed by "squash"