From: Jakub Narebski <jnareb@gmail.com>
Date: Sun, 04 Feb 2007 19:33:50 GMT
Subject: Re: git rebase: unexpected conflict
Message-ID: <eq5cc6$al2$1@sea.gmane.org>
In-Reply-To: <20070204190519.GB29029@mellanox.co.il>

Michael S. Tsirkin wrote:

> git rebase seems to see conflicts where there shouldn't be any.

Were you on a branch that you wanted to rebase? I had made this error once.
git rebase --onto <newbase> <upstream> <branch> moves <upstream>..<branch>
into <newbase>.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git