Akim Demaille wrote: > Hi Jim, > > What do you think about the attached proposal? It started here: > http://lists.gnu.org/archive/html/bug-gnulib/2012-05/msg00217.html > > Le 15 mai 2012 à 10:02, Akim Demaille a écrit : > >> >> Le 14 mai 2012 à 17:19, Akim Demaille a écrit : >> >>> <0001-gitlog-to-changelog-support-the-log-message-format-u.patch> >> >> I had forgotten to include --strip-cherry-pick in --help. >> >> From bb3c407c1f9f436ee608eb2f36fda47359d9f8be Mon Sep 17 00:00:00 2001 >> From: Akim Demaille <a...@lrde.epita.fr> >> Date: Mon, 14 May 2012 17:10:16 +0200 >> Subject: [PATCH] gitlog-to-changelog: support the log message format used in >> Bison. >> >> * build-aux/gitlog-to-changelog: Support --strip-tab and >> --strip-cherry-picked.
Hi Akim, That looks fine, with this change squashed in. Ok with you? diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 91dc147..17c4562 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -73,8 +73,8 @@ OPTIONS: --format=FMT set format string for commit subject and body; see 'man git-log' for the list of format metacharacters; the default is '%s%n%b%n' - --strip-tab remove the leading TAB in commit message lines. - --strip-cherry-pick remove data inserted by "git cherry-pick"; + --strip-tab remove one additional leading TAB from commit message lines. + --strip-cherry-pick remove data inserted by "git cherry-pick"; this includes the "cherry picked from commit ..." line, and the possible final "Conflicts:" paragraph. --help display this help and exit @@ -361,7 +361,7 @@ sub parse_amend_file($) } } - # Strip all the leading TABs. + # Remove one additional leading TAB from each line. $strip_tab and map { s/^\t// } @line;