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:
ddb643e
)
git-debrebase: document that breakwater merges always have single parent
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 23 Jan 2018 15:19:20 +0000
(15:19 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 19:19:06 +0000
(19:19 +0000)
multi-orig upstreams will get a separate commit merging the upstream stuff
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 4ca30eb53e6ea3d518258fb358356dc92f5098f7..5808cf33f7f1b702f29c5e57b1ef01e707a0428f 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-283,7
+283,7
@@
sub calculate_committer_authline () {
#
# BreakwaterUpstreamMerge
# has additional entry in classification result
-# OrigParents = [ subset of Parents ]
+# OrigParents = [ subset of Parents ]
# singleton list
sub classify ($) {
my ($objid) = @_;