echo "Updating from $head to $1."
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
echo "Updating from $head to $1."
git-update-index --refresh 2>/dev/null
new_head=$(git-rev-parse --verify "$1^0") &&
1,*,)
# We are not doing octopus, not fast forward, and have only
# one common. See if it is really trivial.
1,*,)
# We are not doing octopus, not fast forward, and have only
# one common. See if it is really trivial.