chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1507dbc
)
git-debrebase: new-upstream-v0: use update_head_postlaunder
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 31 Jan 2018 15:31:28 +0000
(15:31 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 19:19:07 +0000
(19:19 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 9a71bd30e4607039aa79b47307be4e797664356e..86958820221ec4b1212f708a7e1749572f7a8e29 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-997,7
+997,8
@@
END
# the laundering output, because git-rebase can't easily be made
# to make a replay list which is based on some other branch
- update_head $old_head, $old_laundered_tip, 'launder for new upstream';
+ update_head_postlaunder $old_head, $old_laundered_tip,
+ 'launder for new upstream';
my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw);
runcmd @cmd;