[devscripts] 01/02: debcommit: Correctly show --strip-message is the default in --help

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository devscripts.

commit 62fa985128abc88649a00f3f7b0ead11bd29d7ff
Author: James McCoy <jamessan at debian.org>
Date:   Wed Oct 29 20:33:37 2014 -0400

    debcommit: Correctly show --strip-message is the default in --help
    
    Closes: #766885
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog     | 5 +++++
 scripts/debcommit.pl | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f9eab7..bbee55a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 devscripts (2.14.11) UNRELEASED; urgency=medium
 
+  [ Paul Wise ]
   * Suggest debbindiff for deep .deb comparisons
 
+  [ James McCoy ]
+  * debcommit: Correctly show --strip-message is the default in --help.
+    (Closes: #766885)
+
  -- Paul Wise <pabs at debian.org>  Sun, 19 Oct 2014 17:27:24 +0800
 
 devscripts (2.14.10) unstable; urgency=medium
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index a87ea6a..352bdcd 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -212,8 +212,8 @@ Options:
    -C --confirm        Ask for confirmation of the message before commit
    -e --edit           Edit the message in EDITOR before commit
    -a --all            Commit all files (default except for git)
-   -s --strip-message  Strip the leading '* ' from the commit message
-   --no-strip-message  Do not strip a leading '* ' (default)
+   -s --strip-message  Strip the leading '* ' from the commit message (default)
+   --no-strip-message  Do not strip a leading '* '
    --sign-commit       Enable signing of the commit (git, hg, and bzr)
    --no-sign-commit    Do not sign the commit (default)
    --sign-tags         Enable signing of tags (git only)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git