summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-25 13:53:48 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-25 13:53:48 +0100
commit166a9cf1edb3563eb399a8d3da26831dc69bfaed (patch)
tree0103b6781a621e5f37aefa5faa80bdc985521d04
parent9de02f9d56e123144548a556e1ce32e9ced24f0f (diff)
git-debrebase(5): Document new understanding of debrebase-last
Bug #907208 shows that the previous statement wasn't true. debrebase-last is still marginally useful: we use it for deciding what hints to print in some error messages; detecting and rejecting attempts to convert already-converted branches; and in `git-debrebase status'. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--git-debrebase.5.pod7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index e3ed309..439fd63 100644
--- a/git-debrebase.5.pod
+++ b/git-debrebase.5.pod
@@ -378,8 +378,11 @@ from the interchange branch and no pseudomerge is needed.
When ffq-prev is not present,
C<refs/debrebase-last/B> records some ancestor of refs/B,
(usually, the result of last stitch).
-This can be used to quickly determine whether refs/B
-is being maintained in git-debrebase form.
+This is used for status printing and some error error checks -
+especially for printing guesses what a problem is.
+To determine whether a branch is
+is being maintained in git-debrebase form
+it is necessary to walk its history.
=head1 OTHER MERGES