summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-04-22 22:13:59 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:07:01 +0100
commit38d74ac90781b75e2239440c6430db00d909164a (patch)
tree9b9f85a8dd2c8c1dfba6102819637fe459ae7b7c
parentbcca6a6dfc34e624274055ed1dd3fc3371a539a4 (diff)
git-debrebase: Rename `conclude' to `quick'
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase6
-rw-r--r--git-debrebase.1.pod2
2 files changed, 4 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase
index 5246317..00d2f57 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 bdec02f..2547a98 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.