summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xgit-debrebase2
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 70d600f..0dc3014 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (5.3~) unstable; urgency=medium
Bugfixes:
* Honour GIT_REFLOG_ACTION everywhere. Closes:#901935.
+ * git-debrebase new-upstream: Provide better reflog entries
+ by setting GIT_REFLOG_ACTION. Closes:#901925.
--
diff --git a/git-debrebase b/git-debrebase
index fe11251..658884d 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
}