Re: Folding commits together

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Sep 22, 2010 at 7:33 AM, Maaartin <grajcar1@xxxxxxxxx> wrote:
> Matthieu Moy <Matthieu.Moy <at> grenoble-inp.fr> writes:
>
>> Which exact command did you type? Something like this should do it:
>>
>> git rebase -i HEAD~3
>
> I've tried nearly everything, starting with
>
> git rebase -i d8e3842
>
> which should be the just the same as HEAD~3. I retract the question, my editor
> keeps opening a wrong file, which I've just spotted by accident. The problem was
> caused by a git-cygwin-emacsclient-emacs interaction, rebase works nicely.

Another way to do this if it's the top-most commits is:

$ git reset --soft HEAD~3
$ git commit --amend

j.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]