[Top][All Lists]

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

Re: git magic help required

From: Paolo Bonzini
Subject: Re: git magic help required
Date: Fri, 12 Mar 2010 11:01:12 +0100
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv: Gecko/20100120 Fedora/3.0.1-1.fc12 Lightning/1.0b2pre Thunderbird/3.0.1

On 03/12/2010 04:33 AM, Mike Frysinger wrote:
On Thursday 11 March 2010 19:01:42 Reuben Thomas wrote:
having done some more work on my patch #7017, I pulled updates from
master to make sure I had no conflicts, which worked fine, but now I
have a commit after those updates, and a commit before, which I want
to merge in some way to get a single patch. I'm afraid this is outside
my knowledge of git: what do I do?

use rebase.  i think this might do what you want:
- git rebase -i origin/master
- re-order the commits and then change "pick" to "s" for each commit you want
to squash into a previous one

And next time, use "git pull --rebase" instead of normal "git pull".


reply via email to

[Prev in Thread] Current Thread [Next in Thread]