summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-04-22 22:27:07 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 22:40:12 +0100
commitbdeb85eacfd821cad3e1be0bc844dff5671389b7 (patch)
tree014f5b7b29403c77e819bb5711065837a675baea
parent7f542a225923b6cb8cfd7d744bdc86293e97fdab (diff)
git-debrebase(1): Fix to say that noop is always ok for "quick"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--git-debrebase.1.pod3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 556a442..68447b9 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -61,8 +61,7 @@ Unconditionally launders and restitches the branch,
consuming any ffq-prev
and making a new pseudomerge.
-If the branch is already laundered and stitched, it is an error,
-unless --noop-ok.
+If the branch is already laundered and stitched, does nothing.
=item git-debrebase stitch [--prose=<for commit message>]