Subject: merge -s ffonly

From: "Shawn O. Pearce" <[email-masked]>
Date: Mon, 6 Oct 2008 16:56:11 -0700

I really don't care about this feature.  But Randal's whining on
#git made me stop what I was doing and write something that might
turn into it.

Totally untested code.  It might reformat your C:\ drive and install
Windows ME.  Install as $(git --exec-path)/git-merge-ffonly and
call as `git merge -s ffonly`.

If you care about this sort of feature, test it, write tests for it,
make a formal patch, and send it for review.  No, I will not do this
for you.  As I said, I don't care about this as a feature.

--8<--
diff --git a/git-merge-ffonly.sh b/git-merge-ffonly.sh
new file mode 100644
index 0000000..24363b5
--- /dev/null
+++ b/git-merge-ffonly.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+while test $# -gt 0
+do
+	if test "z$1" = z--
+	then
+		shift
+		break
+	else
+		shift
+	fi
+done
+
+while test $# -gt 0
+do
+	if test -n "$(git rev-list $1..HEAD)"
+	then
+		exit 2
+	fi
+	shift
+done

-- 
Shawn.