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
(from parent 1:
c0e4a8e
)
git-debrebase: fix: document that breakwater merges always have single parent
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 23 Jan 2018 15:20:02 +0000
(15:20 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +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 62fbc4d51acc4bf53ded1391c8cc906d34848d8f..128f2f1d682bda4893e3be6596ec97c95c27d312 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-443,9
+443,11
@@
sub classify ($) {
return $classify->(qw(BreakwaterUpstreamMerge),
OrigParents => [ $p[!$prevbrw] ]);
}
- # xxx multi-.orig upstreams
}
+ # multi-orig upstreams are represented with a breakwater merge
+ # from a single upstream commit which combines the orig tarballs
+
return $unknown->("complex merge");
}