From: Ian Jackson Date: Sun, 22 Apr 2018 21:26:40 +0000 (+0100) Subject: git-debrebase(1): Very minor clarification to "quick" X-Git-Tag: archive/debian/5.0~67 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7f542a225923b6cb8cfd7d744bdc86293e97fdab;p=dgit.git git-debrebase(1): Very minor clarification to "quick" Signed-off-by: Ian Jackson --- diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 2547a98e..556a4422 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -57,15 +57,16 @@ to distinguish them from options for git-debrebase. =item git-debrebase quick -Launder and restitch the branch, -consuming any ffq-prev. +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. =item git-debrebase stitch [--prose=] -Stitch the branch, +Stitches the branch, consuming ffq-prev. If there is no ffq-prev, it is an error, unless --noop-ok.