Re: Multi-branch committing in git, revisited

From: "David E(dot) Wheeler" <david(at)kineticode(dot)com>
To: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
Cc: Bruce Momjian <bruce(at)momjian(dot)us>, pgsql-hackers(at)postgresql(dot)org
Subject: Re: Multi-branch committing in git, revisited
Date: 2010-09-22 04:46:03
Message-ID: 889B5864-F5ED-4B7D-8A1E-1AC710B2A177@kineticode.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

On Sep 21, 2010, at 8:19 PM, Tom Lane wrote:

> You sure about the "staged" part?

Yes, I do it all the time (I make a lot of mistakes).

> Offhand I think I like Andrew's recommendation of a shortlived branch
> better. In essence your idea is using the tip of "master" itself as a
> shortlived branch, which is maybe a bit too cute. If you get distracted
> and need to do something else for awhile, the tip of "master" is not
> where you want your not-yet-pushable work to be.

Yes, I think using branches for everything is generally the way to go. But if you wanted to just use your existing approach, then reset --soft HEAD^ would work, too.

Best,

David

In response to

Browse pgsql-hackers by date

  From Date Subject
Next Message Peter Eisentraut 2010-09-22 05:13:34 Re: psql's \dn versus temp schemas
Previous Message Pavel Stehule 2010-09-22 04:44:58 Re: wip: functions median and percentile