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

Re: How to merge branches except for one commit

From
Imran M Yousuf <imyousuf@gmail.com>
Date
May 29, 2008, 04:38 UTC
Message-ID
<7bfdc29a0805282138kabc5417i4f67ae3995bf238c@mail.gmail.com>
In-Reply-To
<7vhcchrb43.fsf@gitster.siamese.dyndns.org>
Show 7 quoted lines
>
> You can never plan ahead perfectly, so do not be too hard on yourself if
> you occasionally screw up.  Cherry-picking from time to time is Ok.  With
> practice, you will get used to it.  I juggle 5 integration branches to
> maintain git.git itself and it took some practice for me to get
> comfortable with the workflow.
>
I always wanted to know how you did it, thanks for sharing it :).
Best regards,
-- 
Imran M Yousuf
Email: imran@smartitengineering.com
Blog: http://imyousuf-tech.blogs.smartitengineering.com/
Mobile: +880-1711402557
Previous: Junio C HamanoNext: Andrew Arnott
Message 6 of 7 in “How to merge branches except for one commit”
  1. Andrew ArnottMay 29, 2008
  2. Avery PennarunMay 29, 2008
  3. Andrew ArnottMay 29, 2008
  4. Andreas EricssonMay 29, 2008
  5. Junio C HamanoMay 29, 2008
  6. Imran M YousufMay 29, 2008
  7. Andrew ArnottMay 29, 2008

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.