From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 22:44:13 +0000 (+0000)
Subject: git-debrebase: slight message improvements etc.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d3feac0f54822bef7e1b3d264686b6f20b9539f1;p=dgit.git

git-debrebase: slight message improvements etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index acf4c856..5adbb8fe 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -32,8 +32,7 @@
 #    git-debrebase [<options>] stitch [--prose=<for commit message>]
 #    git-debrebase [<options>] downstream-rebase-launder-v0  # experimental
 #
-#    git-debrebase [<options>] convert-from-gbp \
-#             <upstream>
+#    git-debrebase [<options>] convert-from-gbp <upstream-git-rev>
 
 # problems / outstanding questions:
 #
@@ -1164,7 +1163,8 @@ END
 }
 
 sub cmd_convert_from_gbp () {
-    badusage "needs 1 optional argument, the upstream" unless @ARGV<=1;
+    badusage "needs 1 optional argument, the upstream git rev"
+	unless @ARGV<=1;
     my ($upstream_spec) = @ARGV;
     $upstream_spec //= 'refs/heads/upstream';
     my $upstream = git_rev_parse $upstream_spec;
@@ -1210,9 +1210,9 @@ sub cmd_convert_from_gbp () {
 	runcmd @git, qw(checkout -q gdr-internal~0);
 	rm_subdir_cached 'debian/patches';
 	$work = make_commit ['HEAD'], [
- 'git-debrebase convert-from-gbp: drop patch queue',
+ 'git-debrebase convert-from-gbp: drop patches from tree',
  'Delete debian/patches, as part of converting to git-debrebase format.',
- '[git-debrebase convert-from-gbp: drop patches]'
+ '[git-debrebase convert-from-gbp: drop patches from tree]'
 			      ];
 	# make the breakwater pseudomerge
 	# the tree is already exactly right