Skip to main content

Browse the archive

Staging
v0.5.1
Revision 8d712aafd2df3c1f5147a28947f98cefe667cf76 authored by Junio C Hamano on 21 December 2005, 21:51:51 UTC, committed by Junio C Hamano on 21 December 2005, 21:51:51 UTC 
GIT 1.0.0b
 
Signed-off-by: Junio C Hamano <junkio@cox.net>
2 parent s e4e79a2 + 8ac4838
Raw File
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.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
back to top