Thread (14 messages) flat view 14 messages, 7 authors, 2016-06-15

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

From: Wincent Colaiuta <hidden>
Date: 2016-06-15 22:43:45

El 31/10/2007, a las 5:17, Björn Steinbrink escribió:
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help