Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: ffb293b63d13b3b06b454a5f9f0ff6802ef15f0d authored by Junio C Hamano on 12 July 2007, 19:01:47 UTC
GIT 1.5.2.4
Tip revision: ffb293b
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