summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-04-22 22:35:58 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 22:40:13 +0100
commitb5bf8a0f318806562b3089ce8a84d864ee2b3f0f (patch)
treec9bafd2d578eecf9234487070b70b63aff3fb3a3
parent8b875c05ff728c9335f692ccc21c5abfe2203d26 (diff)
git-debrebase: Provide "prepush"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase1
-rw-r--r--git-debrebase.1.pod3
-rwxr-xr-xtests/tests/gdr-subcommands2
3 files changed, 5 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 636ff76..46ea06a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1318,6 +1318,7 @@ sub cmd_stitch () {
badusage "no arguments allowed" if @ARGV;
do_stitch($prose);
}
+sub cmd_prepush () { cmd_stitch(); }
sub cmd_quick () {
badusage "no arguments allowed" if @ARGV;
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 3e4c698..7325170 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -74,10 +74,13 @@ and making a new pseudomerge.
If the branch is already laundered and stitched, does nothing.
+=item git-debrebase prepush [--prose=<for commit message>]
+
=item git-debrebase stitch [--prose=<for commit message>]
Stitches the branch,
consuming ffq-prev.
+This is a good command to run before pushing to a git server.
If there is no ffq-prev, it is an error, unless --noop-ok.
diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index f6d817d..371ad34 100755
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -160,7 +160,7 @@ Ec="F:No ongoing git-debrebase session"
#
subcmd '' Ult Ull Vlt Vl
subcmd stitch Ns Nu Sltf Stf
-#subcmd pre-push Ns Nu Sltf Stf
+subcmd prepush Ns Nu Sltf Stf
subcmd quick ns Sl Sltf Sl
subcmd conclude "$Ec" "$Ec" Sltf Sl
#subcmd make-patches sPft sPft uPft uPft