Skip to main content

Browse the archive

https://github.com/git/git
08 September 2024, 10:46:01 UTC
Revision 9dfdf14b3805e89aa2782458bda15b3dfae24c09 authored by Junio C Hamano on 15 July 2007, 23:41:17 UTC, committed by Junio C Hamano on 15 July 2007, 23:41:17 UTC 
GIT v1.5.3-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e3b4968
Raw File
Tip revision: 9dfdf14b3805e89aa2782458bda15b3dfae24c09 authored by Junio C Hamano on 15 July 2007, 23:41:17 UTC
GIT v1.5.3-rc2
Tip revision: 9dfdf14
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