From e7f642cffe6356d29599fc8737eb01f1b4ea2df5 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 6 Feb 2008 16:39:53 -0800
Subject: [PATCH] Using rebase for the patches has become a failing-hunk pain
 in the neck, so I'm switching to using merge.

---
 support/patch-update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/patch-update b/support/patch-update
index a76f111d..dcfeb6fe 100755
--- a/support/patch-update
+++ b/support/patch-update
@@ -138,8 +138,8 @@ sub update_patch
     open(OUT, '>', "$patches_dir/$patch.diff") or die $!;
     print OUT $description{$patch}, "\n";
 
-    if (system("git rebase -m $parent") != 0) {
-	print qq|"git rebase -m $parent" incomplete -- please fix.\n|;
+    if (system("git merge $parent") != 0) {
+	print qq|"git merge $parent" incomplete -- please fix.\n|;
 	$ENV{PS1} = "[$parent] patch/$patch: ";
 	system $ENV{SHELL} and exit 1;
     }
-- 
2.34.1