fix local not showing if no common ancestor
parent
7e341e3b1f
commit
d0c9d9c985
|
@ -94,8 +94,8 @@ echo ""
|
||||||
echo "remote:"
|
echo "remote:"
|
||||||
git show -s "$PRETTY" "$REMOTE_HASH"
|
git show -s "$PRETTY" "$REMOTE_HASH"
|
||||||
echo ""
|
echo ""
|
||||||
echo "remote:"
|
echo "local:"
|
||||||
git show -s "$PRETTY" "$REMOTE_HASH"
|
git show -s "$PRETTY" "$LOCAL_HASH"
|
||||||
else
|
else
|
||||||
echo "The following commits will be OVERWRITTEN:"
|
echo "The following commits will be OVERWRITTEN:"
|
||||||
git log "$PRETTY" "$FORK_POINT..$REMOTE_HASH"
|
git log "$PRETTY" "$FORK_POINT..$REMOTE_HASH"
|
||||||
|
|
Loading…
Reference in New Issue