X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=d101742114246a8bd61f63c102bad234252b1eac;hp=7c69c4c0b2b970eeeee8eb09edae9488dbc3a6bc;hb=c1e0f468347b80d739d6eefa9eb9d614b18c3c15;hpb=8c4cbc9eafaff67f8029512a0b5e710fb5278390

diff --git a/git-debrebase b/git-debrebase
index 7c69c4c0..d1017421 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -423,7 +423,7 @@ sub merge_series ($$$;@) {
                 " $q->{SeriesTip}]"
             ];
 	    printdebug "merge_series  pec $pec ";
-	    runcmd @git, qw(rm -q --cached), $seriesfile;
+	    runcmd @git, qw(rm -q --ignore-unmatch --cached), $seriesfile;
 	    $pec = make_commit [ $pec ], [
                 "Drop series file from $s to avoid merge trouble",
                 "[git-debrebase merge-innards patch-queue prep:".