Add 'ours' merge strategy.
authorJunio C Hamano <junkio@cox.net>
Wed, 2 Nov 2005 03:34:49 +0000 (19:34 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 3 Nov 2005 22:55:10 +0000 (14:55 -0800)
commit64da9e604eea25c9c20cfe12618285ccd0bf3cfe
tree520ffc10b69b8bf3993f49c2d91685820e96b85d
parent123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8
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>
.gitignore
Makefile
git-merge-ours.sh [new file with mode: 0755]
git-merge.sh