# We are not doing octopus and not fast forward. Need a
+ # We are not doing octopus, not fast forward, and have only
+ # one common. See if it is really trivial.
+ echo "Trying really trivial in-index merge..."
+ git-update-index --refresh 2>/dev/null
+ if git-read-tree --trivial -m -u $common $head "$1" &&
+ git-commit-tree $result_tree -p HEAD -p "$1"
+ git-update-ref HEAD $result_commit $head
# An octopus. If we can reach all the remote we are up to date.