Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision aadd4efa715f56e0eac5ac459c8ff4933b56d4ce authored by Junio C Hamano on 08 January 2008, 06:41:43 UTC, committed by Junio C Hamano on 08 January 2008, 06:41:43 UTC 
GIT 1.5.3.8
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent eee8a17
Raw File
Tip revision: aadd4efa715f56e0eac5ac459c8ff4933b56d4ce authored by Junio C Hamano on 08 January 2008, 06:41:43 UTC
GIT 1.5.3.8
Tip revision: aadd4ef
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