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

Re: [PATCH 1/1] Add --first-parent support to interactive rebase.

From
Wincent Colaiuta <win@wincent.com>
Date
Oct 31, 2007, 08:24 UTC
Message-ID
<B168AF44-265B-4339-BD00-10CD1ECB9394@wincent.com>
In-Reply-To
<20071031041751.GA3326@atjola.homenet>
El 31/10/2007, a las 5:17, Björn Steinbrink escribió:
Show 10 quoted lines
> How about:
> \--first-parent::
> 	When this option is given and --preserve-merges is not, then
> 	merge commits are completely ignored and only commits from the
> 	first parent ancestry are rebased. This allows to pretend that
> 	merges never happened.
>
> 	If --preserve-merges is also given, the merge commits are
> 	preserved, but only their first parent is rebased as opposed to
> 	the default behaviour which would rebase all parents.
Minor nitpick:

- first parent ancestry are rebased. This allows to pretend that + first parent ancestry are rebased. This allows you to pretend that

Cheers, Wincent

Previous: Johannes SchindelinNext: Junio C Hamano
Message 5 of 18 in “Add --first-parent support to interactive rebase.”
  1. 1/1 Add --first-parent support to interactive rebase.Björn Steinbrink, Oct 31, 2007
  2. Johannes SchindelinOct 31, 2007
  3. Björn SteinbrinkOct 31, 2007
  4. Johannes SchindelinOct 31, 2007
  5. Wincent ColaiutaOct 31, 2007
  6. Junio C HamanoOct 31, 2007
  7. Björn SteinbrinkOct 31, 2007
  8. Dmitry PotapovOct 31, 2007
  9. Karl HasselströmOct 31, 2007
  10. Dmitry PotapovOct 31, 2007
  11. Jeff KingOct 31, 2007
  12. Björn SteinbrinkOct 31, 2007
  13. Junio C HamanoOct 31, 2007
  14. Jeff KingOct 31, 2007
  15. Junio C HamanoOct 31, 2007
  16. Jeff KingNov 1, 2007
  17. Junio C HamanoNov 1, 2007
  18. Jeff KingNov 1, 2007

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.