Diff, exclude noisy path
git diff master production -- !vendor
Rebase
so "--ours" means the anonymous one rebase is building while "--theirs" means "our branch being rebased"
the side reported as ours is the so-far rebased series, starting with
<upstream>,
and theirs is the working branch.
In other words, the sides are swapped.
is "ours" always the upper of the two versions displayed?
Posted by Ev Dolzhenko to Ev's deck (2015-02-03 15:03)