diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-23 15:19:20 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 747c6f2eaf1929665a4c19ad4654bba0790b9e01 (patch) | |
tree | 0cda7cf504ec34b0c7dc4d630ebc1594ca0fa30b /git-debrebase | |
parent | cbdd01d05713f2faaab329505e878cb22500bbdd (diff) |
git-debrebase: document that breakwater merges always have single parent
multi-orig upstreams will get a separate commit merging the upstream stuff
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 4ca30eb..5808cf3 100755 --- 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) = @_; |