Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision e02cd6388f0193706279268a7d9fa57be4cbc997 authored by Junio C Hamano on 10 November 2006, 19:53:41 UTC, committed by Junio C Hamano on 12 November 2006, 02:26:57 UTC 
git-cvsserver: read from git with -z to get non-ASCII pathnames.
 
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 057bc80
Raw File
Tip revision: e02cd6388f0193706279268a7d9fa57be4cbc997 authored by Junio C Hamano on 10 November 2006, 19:53:41 UTC
git-cvsserver: read from git with -z to get non-ASCII pathnames.
Tip revision: e02cd63
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