aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-01 19:34:49 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-03 14:55:10 -0800
commit64da9e604eea25c9c20cfe12618285ccd0bf3cfe (patch)
tree520ffc10b69b8bf3993f49c2d91685820e96b85d /Makefile
parent123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8 (diff)
downloadgit-64da9e604eea25c9c20cfe12618285ccd0bf3cfe.tar.gz
git-64da9e604eea25c9c20cfe12618285ccd0bf3cfe.tar.xz
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index be6101ab2..6c01dc295 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ SCRIPT_SH = \
git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
git-applymbox.sh git-applypatch.sh git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
- git-merge-resolve.sh git-grep.sh
+ git-merge-resolve.sh git-merge-ours.sh git-grep.sh
SCRIPT_PERL = \
git-archimport.perl git-cvsimport.perl git-relink.perl \