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:
52d1506
)
git-debrebase: merge: Record the new-base in the wreckage.
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:24:20 +0000
(20:24 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:24:20 +0000
(20:24 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 18bc21f0dbb965b48f4aebc4c8a07d7e67e4ba3e..910e444df28aca907c99b7ac56c63cd32f65ccf7 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1470,6
+1470,7
@@
sub walk ($;$$$) {
@parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
} elsif ($method eq 'MergeMergeSeries') {
print "Running merge resolution for $cl->{CommitId}...\n";
+ $mwrecknote->('new-base', $build);
$build = merge_series
$build, $cl->{MergeWreckNotes},
$cl->{MergeInterchangeBaseInfo},