chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Provide conclude subcommand
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index ab1990aff7be6c721d2e8629083fbcb994ee3b23..72b48288e7879ef4a799e8065de49a5e08f15bce 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1304,6
+1304,12
@@
sub cmd_stitch () {
do_stitch($prose);
}
do_stitch($prose);
}
+sub cmd_conclude () {
+ badusage "no arguments allowed" if @ARGV;
+ do_launder_head 'launder for conclude';
+ do_stitch 'conclude';
+}
+
sub cmd_convert_from_gbp () {
badusage "needs 1 optional argument, the upstream git rev"
unless @ARGV<=1;
sub cmd_convert_from_gbp () {
badusage "needs 1 optional argument, the upstream git rev"
unless @ARGV<=1;