From: Wayne Davison <wayned@samba.org>
Date: Thu, 7 Feb 2008 00:39:53 +0000 (-0800)
Subject: Using rebase for the patches has become a failing-hunk
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/e7f642cffe6356d29599fc8737eb01f1b4ea2df5

Using rebase for the patches has become a failing-hunk
pain in the neck, so I'm switching to using merge.
---

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;
     }