Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision ae4a35261d5d0050445c66171111e46e3fae1edc authored by Junio C Hamano on 16 January 2006, 05:11:30 UTC, committed by Junio C Hamano on 16 January 2006, 05:11:30 UTC 
GIT 1.0.11
2 parent s e99c2fb + ee3d299
Raw File
Tip revision: ae4a35261d5d0050445c66171111e46e3fae1edc authored by Junio C Hamano on 16 January 2006, 05:11:30 UTC
GIT 1.0.11
Tip revision: ae4a352
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