Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 5a2282de13c4da13f979185e652c8a08e2481fd1 authored by Junio C Hamano on 08 January 2006, 22:22:19 UTC, committed by Junio C Hamano on 08 January 2006, 22:22:19 UTC 
GIT 1.1.0
2 parent s e77f489 + 8fc11b5
Raw File
Tip revision: 5a2282de13c4da13f979185e652c8a08e2481fd1 authored by Junio C Hamano on 08 January 2006, 22:22:19 UTC
GIT 1.1.0
Tip revision: 5a2282d
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