From: Wincent Colaiuta <win@wincent.com>
Date: Wed, 31 Oct 2007 08:24:36 GMT
Subject: Re: [PATCH 1/1] Add --first-parent support to interactive rebase.
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ó:

> 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