From: Jim Meyering <meyering@redhat.com>
Date: Mon, 2 Jan 2012 09:59:17 +0000 (+0100)
Subject: gitlog-to-changelog: fix typo in --help: show backslash before email @
X-Git-Tag: v0.1~1320
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=d6e34eccef7fdd4032743eab7c0b1b92c31399e9;p=gnulib.git

gitlog-to-changelog: fix typo in --help: show backslash before email @

* build-aux/gitlog-to-changelog (usage): An "@" was backslash-escaped
in sources, but not in actual output.
---

diff --git a/ChangeLog b/ChangeLog
index b65842aee..efa62c0ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-02  Jim Meyering  <meyering@redhat.com>
+
+	gitlog-to-changelog: fix typo in --help: show backslash before email @
+	* build-aux/gitlog-to-changelog (usage): An "@" was backslash-escaped
+	in sources, but not in actual output.
+
 2011-12-30  Jim Meyering  <meyering@redhat.com>
 
 	gitlog-to-changelog: don't malfunction when name contains %-directive
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index c3434a9ee..8825685aa 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2011-12-30 17:48'; # UTC
+my $VERSION = '2012-01-02 09:55'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -93,7 +93,7 @@ s/all tile types/all file types/
 1379ed974f1fa39b12e2ffab18b3f7a607082202
 # Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
 # Change the author to be Paul.  Note the escaped "@":
-s,Jim .*>,Paul Eggert <eggert\@cs.ucla.edu>,
+s,Jim .*>,Paul Eggert <eggert\\\@cs.ucla.edu>,
 
 EOF
     }