https://github.com/git/git
Raw File
Tip revision: 2ecf3cee0754961401200e9f35071001ccdbbce3 authored by Junio C Hamano on 03 July 2007, 06:29:54 UTC
Mark disused commit walkers officially deprecated.
Tip revision: 2ecf3ce
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