Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 1d557352f18a4b8f73be402674af6bd5bb152ab9 authored by Junio C Hamano on 01 December 2007, 19:20:00 UTC
GIT 1.5.3.7
Tip revision: 1d55735
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