Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision e99c2fbdda590b0d5fb5bd89001e6d9df8342564 authored by Junio C Hamano on 14 January 2006, 00:39:17 UTC, committed by Junio C Hamano on 14 January 2006, 00:39:17 UTC 
GIT 1.0.10
2 parent s 0de62e5 + a0dfb48
Raw File
Tip revision: e99c2fbdda590b0d5fb5bd89001e6d9df8342564 authored by Junio C Hamano on 14 January 2006, 00:39:17 UTC
GIT 1.0.10
Tip revision: e99c2fb
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