Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 806ea701ce3624aa6a89648b6ca5d858703398cb authored by Junio C Hamano on 19 September 2007, 10:11:28 UTC
GIT 1.5.3.2
Tip revision: 806ea70
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