Re: [PATCH] rebase --fix: interactive fixup mode

From: Jakub Narebski <jnareb@gmail.com>
Date: Jan 8, 2012, 21:57 UTC
Message-ID: <m3r4z9eu36.fsf@localhost.localdomain>
In-Reply-To: <20120108213134.GA18671@ecki.lan>

Clemens Buchacher <drizzd@aon.at> writes:

[...]

> In order to determine a suitable range automatically, it is a reasonable
> heuristic to rebase onto the most recent merge commit.

Why not additionally / instead take into account remote-tracking branches for "push" remotes?

Show 16 quoted lines

> It does not
> guarantee that published commits are not included -- indeed there is no
> way to do that. But, the range is usually large enough to contain the
> desired commits. Also, this mechanism works regardless of whether or not
> branch tracking has been configured.
> 
> So instead of the above command, one can instead use the following:
> 
>  git rebase --fix
> 
> By default, the range is limited to a maximum of 20 commits. This can be
> changed by passing a different number to --fix, e.g.:
> 
>  git rebase --fix=50
> 
> Signed-off-by: Clemens Buchacher <drizzd@aon.at>

Nice idea!

-- 
Jakub Narebski
Poland