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:
06163c6
)
git-debrebase: Fix a message to use "" properly
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 22 Apr 2018 22:22:53 +0000
(23:22 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 21:40:13 +0000
(22:40 +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 c02fe8a27e2c25d8c573ce88b7ddda8ca3828cb4..e3fea7c84a1d2824c23fd933fdb2a7c3ab1e9ebe 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-560,7
+560,7
@@
sub keycommits ($;$$$) {
$breakwater = undef;
} elsif ($ty eq 'Mixed') {
$x->($unclean, 'mixed',
-
'found mixed upstream/packaging commit ($head)'
);
+
"found mixed upstream/packaging commit ($head)"
);
$clogonly = undef;
$breakwater = undef;
} elsif ($ty eq 'Pseudomerge' or