git-debrebase: Rename `conclude' to `quick'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index 524631787575bb459556a696c92850e040a8b970..00d2f575a6d29361fdc7ddf397f0e1a9be7348db 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1319,10 +1319,10 @@ sub cmd_stitch () {
     do_stitch($prose);
 }
 
-sub cmd_conclude () {
+sub cmd_quick () {
     badusage "no arguments allowed" if @ARGV;
-    do_launder_head 'launder for conclude';
-    do_stitch 'conclude';
+    do_launder_head 'launder for git-debrebase quick';
+    do_stitch 'quick';
 }
 
 sub cmd_convert_from_gbp () {

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index bdec02f6b2669a8ae0481da3790b7bf1c263c7f3..2547a98eecf44f6dbd28414427c63ce0fbffe588 100644 (file)
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -55,7 +55,7 @@ The options for git-rebase must either start with C<-i>,
 or be prececded by C<-->,
 to distinguish them from options for git-debrebase.
 
-=item git-debrebase conclude
+=item git-debrebase quick
 
 Launder and restitch the branch,
 consuming any ffq-prev.