X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=inline;f=git-debrebase;h=04befff5484477c888825954b20ae53c760ce983;hb=0899e14ec8d3eb877f4190882c5c3e92d02c460b;hp=fe11251a9a7d95022af614537c5a3cd09d42c182;hpb=11c8c965c3419fddf2444a7497b45b65f05d3db5;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index fe11251a..04befff5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1351,6 +1351,8 @@ END
         'launder for new upstream';
 
     my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw, @ARGV);
+    local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
+	"debrebase new-upstream $new_version: rebase";
     runcmd @cmd;
     # now it's for the user to sort out
 }
@@ -1502,7 +1504,7 @@ sub make_patches_staged ($) {
 	    { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
 	    failedcmd @gbp_cmd;
 	}
-	runcmd @git, qw(add debian/patches);
+	runcmd @git, qw(add -f debian/patches);
     };
 }