[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lilypond-devel
Subject:    Re: [PATCH] which-page
From:       Thomas Morley <thomasmorley65 () googlemail ! com>
Date:       2012-06-29 9:46:38
Message-ID: CABsfGyVsqsrRLb07YP_ZJ=EbUEgD+9W1o-vRjSzoFj+hHZPGjA () mail ! gmail ! com
[Download RAW message or body]

2012/6/29 David Kastrup <dak@gnu.org>:
(...)
> That's a patch 2/2. =A0In this case, you don't really want to have two
> separate commits, but replace the previous commit with a changed one.
> The usual way to do that is to commit with git commit --amend ...
>
> Now that you already have made two commits, the idea is to fold both
> commits into one. =A0Assuming that you have set EDITOR/VISUAL to an edito=
r
> with which you are reasonably comfortable, you can do that with
>
> git rebase -i HEAD~2
>
> and then editing the offered file by marking the second commit with
> "fixup". =A0After that, reupload with git cl.
>
> --
> David Kastrup

just uploaded a new patch set.

Thanks again for the hints and your help.

Seems like you're volunteering for being my mentor. ;)



-Harm


[prev in list] [next in list] [prev in thread] [next in thread]