From: Johannes Sixt <j.sixt@eudaptics.com>
Date: Wed, 04 Jul 2007 13:45:14 GMT
Subject: Re: How to rebase after upstream was merged?
Message-ID: <468BA46A.C66E85CA@eudaptics.com>
In-Reply-To: <Pine.LNX.4.64.0707041426570.4071@racer.site>

Johannes Schindelin wrote:
> [...how to check for linear history...]
> I usually to
> 
>         test -z "$(git rev-list --parents origin..HEAD | grep " .* ")"

Ah, that's much better.

Thanks,
-- Hannes