From: Mike Hommey <mh@glandium.org>
Date: Sat, 01 Mar 2008 11:17:16 GMT
Subject: [RFC] git rebase -s ours
Message-ID: <20080301111716.GA3263@glandium.org>

Hi,

What do you think git rebase -s ours should be considering as "ours"?
If I'm not mistaken, at the moment, "ours" stands for "upstream", which
is kind of confusing...

Mike