diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-14 16:24:23 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:00 +0100 |
commit | 134858eaf9df5e8e6f03c67b40c8ce4cc119b41e (patch) | |
tree | 224464fb5f005c2ba7269025ea6f9f04573cd5cb /git-debrebase.1.pod | |
parent | 190c045107f1681dd7f5232bd3ad41088e0a8244 (diff) |
git-debrebase(1),(5): More changes from conversation with Sean
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r-- | git-debrebase.1.pod | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 9140702..7e12624 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -17,8 +17,11 @@ This is the command line reference. Please read the tutorial L<dgit-maint-debrebase(5)>. For background, theory of operation, -and definitions of the terms used here, -see L<git-debrebase(5)>. +and definitions see L<git-debrebase(5)>. + +You should read this manpage in conjunction with +L<git-debrebase(5)/TERMINOLOGY>, +which defines many important terms used here. =head1 PRINCIPAL OPERATIONS @@ -299,14 +302,15 @@ in the text for the relvant operation. =item --anchor=<commit-ish> -Treats <commit-ish> as an anchor, -regardless of what it's actually like. +Treats <commit-ish> as an anchor. +This overrides the usual automatic commit classification logic. -(It is a problem for -git-debrebase new-upstream operations -if <commit-ish> is the previous anchor to be used, -because treating an arbitrary commit as an anchor -means forgoing upstream coherency checks.) +It also disables some coherency checks +which depend on metadata extracted from its commit message, +so +it is a problem if <commit-ish> is the anchor +for the previous upstream version in +git-debrebase new-upstream operations. =item -D |