From: | "David E(dot) Wheeler" <david(at)kineticode(dot)com> |
---|---|
To: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
Cc: | pgsql-hackers(at)postgreSQL(dot)org |
Subject: | Re: Multi-branch committing in git, revisited |
Date: | 2010-09-22 02:16:31 |
Message-ID: | 3B8485A8-4CDE-476F-BFB5-535FFE131A7E@kineticode.com |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-hackers |
On Sep 21, 2010, at 6:20 PM, Tom Lane wrote:
> While this isn't much worse than what I was used to with CVS, it's
> definitely not better. I think that I could simplify transferring the
> patch back to older branches if I could use git cherry-pick. However,
> that only works on already-committed patches. If I commit in master
> before I start working on 9.0, and so on back, then the commits will be
> separated in time by a significant amount, thus destroying any chance of
> having git_topo_order recognize them as related. So we're back up
> against the problem of git not really understanding the relationships of
> patches in different branches.
You could commit in each one as you go, cherry-pick, and then in each one
git reset --soft HEAD^
Then they'd all be patched and staged.
Best,
David
From | Date | Subject | |
---|---|---|---|
Next Message | Hitoshi Harada | 2010-09-22 02:21:01 | Re: wip: functions median and percentile |
Previous Message | Andrew Dunstan | 2010-09-22 02:12:38 | Re: Multi-branch committing in git, revisited |