From 21d1ac9e195c8c5448fc1084ea941d6cbfa4f8b5 Mon Sep 17 00:00:00 2001
From: Stephen Haberman <stephen@exigencecorp.com>
Date: Thu, 21 Aug 2008 00:51:07 -0500
Subject: [PATCH] Move to scripts--still a work in progress.

---
 remerge.sh => scripts/remerge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename remerge.sh => scripts/remerge (93%)

diff --git a/remerge.sh b/scripts/remerge
similarity index 93%
rename from remerge.sh
rename to scripts/remerge
index b328f92..99d868b 100644
--- a/remerge.sh
+++ b/scripts/remerge
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-git rev-list --first-parent "stable..HEAD" | while read commit ; do
+git rev-list --first-parent "origin/stable..HEAD" | while read commit ; do
 	number_of_parents=$(git rev-list -n 1 --parents $commit | sed 's/ /\n/g' | grep -v $commit | wc -l)
 	if [[ $number_of_parents > 1 ]] ; then
 		# For each parent
-- 
2.39.5