On Tue, Dec 28, 2010 at 11:50 PM, Tom Lane <tgl@sss.pgh.pa.us> wrote:
> Robert Haas <robertmhaas@gmail.com> writes:
>> On Tue, Dec 28, 2010 at 11:02 PM, Tom Lane <tgl@sss.pgh.pa.us> wrote:
>>> I heard the siren call of git cherry-pick, but should have lashed myself
>>> to the mast.
>
>> Applying the same patch blindly to every branch can bite you no matter
>> how you move the patch around.
>
> Sure. But git cherry-pick encourages you to commit first and test
> later, which is how come I ended up with a commit I couldn't undo.
> Think I'll use -n in future.
Well, you *can* undo it quite easily, as long as you haven't pushed
it. git reset --hard origin/master, git commit --amend, git rebase -i
origin/master, etc.
--
Robert Haas
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company