git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: "Branch objects" (was: Re: cherry picking and merge)

From
Tony Finch <dot@dotat.at>
Date
Aug 7, 2014, 17:47 UTC
Message-ID
<alpine.LSU.2.00.1408071829470.13901@hermes-1.csi.cam.ac.uk>
In-Reply-To
<20140807172207.GP23449@localhost>
Nico Williams <nico@cryptonector.com> wrote:
Show 9 quoted lines
> On Thu, Aug 07, 2014 at 05:42:34PM +0100, Tony Finch wrote:
> >
> > The problem is that the production branch gets copied around: pushed to
> > the repo server, pulled by other team members, etc. Forced pushes
> > are accident-prone, as is resetting a rebased branch after a pull.
>
> When I rebase and I need the old HEAD around I do something like this:
> [...]
> Either way I retain the old HEAD with some name.

Hmm, yes, I can see that would work. However my previous workflow was rather branch-heavy and I found the accumulation of names annoying. I have not yet had enough usage out of git-repub to see if it goes too far in the direction of lack-of-names. A big omission is no opportunity to edit its commit messages.

Tony.
-- 
f.anthony.n.finch  <dot@dotat.at>  http://dotat.at/
Rockall: Southwesterly becoming cyclonic in north, 5 to 7. Moderate or rough.
Rain or showers. Moderate or good.
Previous: Nico WilliamsNext: Nico Williams
Message 7 of 9 in “"Branch objects" (was: Re: cherry picking and merge)”
  1. Jakub NarębskiAug 6, 2014
  2. Nico WilliamsAug 6, 2014
  3. Tony FinchAug 7, 2014
  4. Nico WilliamsAug 7, 2014
  5. Tony FinchAug 7, 2014
  6. Nico WilliamsAug 7, 2014
  7. Tony FinchAug 7, 2014
  8. Nico WilliamsAug 7, 2014
  9. Nico WilliamsAug 7, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.