Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 865d370c4daf21e3d6dd48708fc4b716b63d795c authored by Junio C Hamano on 13 April 2011, 21:01:03 UTC
Git 1.7.5-rc2
Tip revision: 865d370
git-merge-ours.sh
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#

# We need to exit with 2 if the index does not match our HEAD tree,
# because the current index is what we will be committing as the
# merge result.

git diff-index --quiet --cached HEAD -- || exit 2

exit 0
back to top