[git-users] Re: Squash first two commits together

2014-07-24 Thread Waldek M.
Maybe you could do some cherry-picking to a separate branch and then squash it? Waldek -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to

Re: [git-users] Re: Squash first two commits together

2014-07-24 Thread Gergely Polonkai
Thank you, this option slipped my eye at 1am somehow :-) On 23 Jul 2014 08:03, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Wednesday, July 23, 2014 3:44:15 AM UTC+4, Gergely Polonkai wrote: I have a fresh repository, with only three commits. I made a mistake, as the first

[git-users] Re: Squash first two commits together

2014-07-23 Thread Konstantin Khomoutov
On Wednesday, July 23, 2014 3:44:15 AM UTC+4, Gergely Polonkai wrote: I have a fresh repository, with only three commits. I made a mistake, as the first two commits should be one. Normally I would do that with an interactive rebase, but in this case I cannot use origin/master (as there are