From 38d74ac90781b75e2239440c6430db00d909164a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Apr 2018 22:13:59 +0100 Subject: [PATCH] git-debrebase: Rename `conclude' to `quick' Signed-off-by: Ian Jackson --- git-debrebase | 6 +++--- git-debrebase.1.pod | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/git-debrebase b/git-debrebase index 52463178..00d2f575 100755 --- 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 bdec02f6..2547a98e 100644 --- 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. -- 2.30.2