summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-02 03:34:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-03 22:55:10 (GMT)
commit64da9e604eea25c9c20cfe12618285ccd0bf3cfe (patch)
tree520ffc10b69b8bf3993f49c2d91685820e96b85d /git-merge-ours.sh
parent123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8 (diff)
downloadgit-64da9e604eea25c9c20cfe12618285ccd0bf3cfe.zip
git-64da9e604eea25c9c20cfe12618285ccd0bf3cfe.tar.gz
git-64da9e604eea25c9c20cfe12618285ccd0bf3cfe.tar.bz2
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 'git-merge-ours.sh')
-rwxr-xr-xgit-merge-ours.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-merge-ours.sh b/git-merge-ours.sh
new file mode 100755
index 0000000..a64704f
--- /dev/null
+++ b/git-merge-ours.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+# Pretend we resolved the heads, but declare our tree trumps everybody else.
+#
+exit 0