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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 31, 2007, 03:34 UTC
Message-ID: <Pine.LNX.4.64.0710310329520.4362@racer.site>
In-Reply-To: <1193797309-1161-1-git-send-email-B.Steinbrink@gmx.de>

Hi,

On Wed, 31 Oct 2007, Björn Steinbrink wrote:

Show 11 quoted lines

> @@ -246,6 +292,13 @@ OPTIONS
>  	Instead of ignoring merges, try to recreate them.  This option
>  	only works in interactive mode.
>  
> +\--first-parent::
> +	Only follow the first parent commits in merge commits when looking
> +	for the commits that are to be rebased. This is most useful with -p
> +	as it will cause rebase to recreate the merges against the original
> +	branches instead of rebasing those branches as well. This option
> +	only works in interactive mode.
> +

Hmm. I had to read this several times to understand it. Maybe something like this instead?

\--first-parent::
	When you want to preserve merges, this option allows you to rebase 
	only the commits which were not merged in, i.e. which are in the
	first parent ancestry of the current HEAD.
+
This option only makes sense together with --preserve-merges.

Also, could you please add a test case to make sure that your patch works as advertised (and that this functionality will not be broken in future commits)?

Thanks, Dscho