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:
d9098cc
)
WIP
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Feb 2017 14:27:00 +0000
(14:27 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 24 Aug 2017 14:43:39 +0000
(15:43 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 6bed234d3c811515443f69703b904ab2b3190ede..6084a29b79802df02741f4693c80f44a05a3837e 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-198,7
+198,7
@@
sub classify ($) {
}
sub launder ($;$) {
- my ($cur, $wantdebonly) = @_;
+ my ($cur, $
pseudos_must_overwrite, $
wantdebonly) = @_;
# go through commits backwards
# we generate two lists of commits to apply
my (@deb_cl, @ups_cl);
@@
-241,6
+241,8
@@
sub launder ($;$) {
$queue->(\@ups_cl, "upstream");
next;
} elsif ($ty eq 'Pseudomerge') {
+ if (defined $pseudos_must_overwrite) {
+ }
push @pseudomerges, $cl;
$cur = $ty->{Contributor};
next;