Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 27dedf0c3b78d1072fb5449149421284f9e5297b authored by Junio C Hamano on 17 November 2005, 05:32:44 UTC, committed by Junio C Hamano on 17 November 2005, 05:32:44 UTC 
GIT 0.99.9j aka 1.0rc3
 
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 60d64db
Raw File
Tip revision: 27dedf0c3b78d1072fb5449149421284f9e5297b authored by Junio C Hamano on 17 November 2005, 05:32:44 UTC
GIT 0.99.9j aka 1.0rc3
Tip revision: 27dedf0
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