they apparently substituted in for the merge-base.)
Chris
commit 2b9288cc90175557766ef33e350e0514470b6ad4
Author: Chris Torek
Date: Tue Jul 5 05:15:23 2016 -0700
git diff: improve A...B merge-base handling
When git diff is given a symmetric difference A...B, it chooses
some merge b
)
status before stash:
MM basefile
Saved working directory and index state WIP on master: 3097b8b initial
HEAD is now at 3097b8b initial
stash created
in the index, basefile contains:
1 base
2 add to basefile
in the WIP, basefile contains:
1 base
in the actual basefile:
1 base
2 matches
Mail list logo