On Fri, Sep 14, 2018 at 10:23 AM Junio C Hamano <gits...@pobox.com> wrote: > > Matthew DeVore <matv...@google.com> writes: > > > Signed-off-by: Matthew DeVore <matv...@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"
