summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 18:41:40 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-19 18:50:34 +0100
commite66c2cf3f7182a3e6f52945636a807ed4a959d5b (patch)
tree4f07998cf94817851dba90e7004915ca52dc5ab4 /git-debrebase
parent76b47400a06d576939c8b010cdec1c506714e780 (diff)
git-debrebase: `prepush' is now a silent no-op if unstitched.
This is more friendly. Update the docs accordingly. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index 61507ea..c273976 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2275,7 +2275,10 @@ sub cmd_stitch () {
badusage "no arguments allowed" if @ARGV;
do_stitch $prose, 0;
}
-sub cmd_prepush () { cmd_stitch(); }
+sub cmd_prepush () {
+ $opt_noop_ok = 1;
+ cmd_stitch();
+}
sub cmd_quick () {
badusage "no arguments allowed" if @ARGV;