Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision c63da8d8e8c5b5078e59af15c1a41ff98ad61d59 authored by Junio C Hamano on 23 December 2005, 02:14:31 UTC, committed by Junio C Hamano on 23 December 2005, 02:14:31 UTC 
GIT 1.0.3
 
Signed-off-by: Junio C Hamano <junkio@cox.net>
2 parent s 8d712aa + 1e80e04
Raw File
Tip revision: c63da8d8e8c5b5078e59af15c1a41ff98ad61d59 authored by Junio C Hamano on 23 December 2005, 02:14:31 UTC
GIT 1.0.3
Tip revision: c63da8d
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