From: martin f krafft <madduck@madduck.net>
Date: Fri, 13 Jul 2007 06:09:09 GMT
Subject: Re: Lump commit HOWTO?
Message-ID: <20070713060909.GA18442@lapse.madduck.net>
In-Reply-To: <625fc13d0707121821l70e2d6aaw555c79b5d700585f@mail.gmail.com>

also sprach Josh Boyer <jwboyer@gmail.com> [2007.07.13.0321 +0200]:
> 8) take all local commits (A - D) and create a single commit without
> any of the upstream changes in it

This is entirely untested and since I am a newbie, it might well not
work, but shouldn't the following do what you want?

git log origin..master --> gives you the local commits not in origin
git checkout -b merger
git merge --squash <sha> <sha> <sha> ...
git commit ...

-- 
martin;              (greetings from the heart of the sun.)
  \____ echo mailto: !#^."<*>"|tr "<*> mailto:" net@madduck
 
spamtraps: madduck.bogus@madduck.net
 
officer, arrest that man! he's whistling a copyrighted song.