Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 5073eb04d6f0e8ac2578140b9231817e2afefe50 authored by Junio C Hamano on 14 December 2005, 02:19:12 UTC, committed by Junio C Hamano on 14 December 2005, 10:53:45 UTC 
applypatch: no need to do non-portable [[ ... ]]
 
... when old, proven, case would do.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 9678faa
Raw File
Tip revision: 5073eb04d6f0e8ac2578140b9231817e2afefe50 authored by Junio C Hamano on 14 December 2005, 02:19:12 UTC
applypatch: no need to do non-portable [[ ... ]]
Tip revision: 5073eb0
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