diff options
| author | Wayne Davison <wayned@samba.org> | 2008-02-06 16:39:53 -0800 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2008-02-06 16:39:53 -0800 |
| commit | e7f642cffe6356d29599fc8737eb01f1b4ea2df5 (patch) | |
| tree | ffacb6f1aa87df325603d6f6bda7ac2d451f5638 | |
| parent | 3e8fe565ede6ab0fd9b84639cac9d7ea3fb0dcf2 (diff) | |
| download | rsync-e7f642cffe6356d29599fc8737eb01f1b4ea2df5.tar.gz rsync-e7f642cffe6356d29599fc8737eb01f1b4ea2df5.tar.bz2 rsync-e7f642cffe6356d29599fc8737eb01f1b4ea2df5.zip | |
Using rebase for the patches has become a failing-hunk
pain in the neck, so I'm switching to using merge.
| -rwxr-xr-x | support/patch-update | 4 |
1 files 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; } |