git/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
Add 'ours' merge strategy. This adds the coolest merge strategy ever, "ours". It can take arbitrary number of foreign heads and merge them into the current branch, with the resulting tree always taken from our branch head, hence its name. What this means is that you can declare that the current branch supersedes the development histories of other branches using this merge strategy. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-02 03:34:49 +00:00			`#!/bin/sh`
			`#`
			`# Copyright (c) 2005 Junio C Hamano`
			`#`
			`# Pretend we resolved the heads, but declare our tree trumps everybody else.`
			`#`
git-merge-ours: make sure our index matches HEAD git-merge expects this check to be done appropriately by the merge strategy backends. In the case of merge-ours strategy, the resulting tree comes what we have in the index file, so it must match the current HEAD; otherwise it would not be "ours" merge. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-03 09:51:25 +00:00
			`# 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`

Add 'ours' merge strategy. This adds the coolest merge strategy ever, "ours". It can take arbitrary number of foreign heads and merge them into the current branch, with the resulting tree always taken from our branch head, hence its name. What this means is that you can declare that the current branch supersedes the development histories of other branches using this merge strategy. Signed-off-by: Junio C Hamano <junkio@cox.net> 2005-11-02 03:34:49 +00:00			`exit 0`