Mercurial > hg > octave-lyh > gnulib-hg
changeset 13364:f07c1f071ff0
git-merge-changelog: Enable --split-merged-entry by default.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 23 May 2010 18:03:16 +0200 |
parents | 282cf4393ce3 |
children | 09288814c405 |
files | ChangeLog lib/git-merge-changelog.c |
diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-05-23 Bruno Haible <bruno@clisp.org> + + git-merge-changelog: Enable --split-merged-entry by default. + * lib/git-merge-changelog.c (main): Set split_merged_entry to true. + (usage): Don't mention this option any more. + Reported by Ralf Wildenhues. + 2010-05-23 Jim Meyering <meyering@redhat.com> test-pwrite: do not leave behind a test file named "out"
--- a/lib/git-merge-changelog.c +++ b/lib/git-merge-changelog.c @@ -1,5 +1,5 @@ /* git-merge-changelog - git "merge" driver for GNU style ChangeLog files. - Copyright (C) 2008-2009 Bruno Haible <bruno@clisp.org> + Copyright (C) 2008-2010 Bruno Haible <bruno@clisp.org> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -947,6 +947,7 @@ printf ("B-FILE-NAME names the user-modified file.\n"); printf ("Writes the merged file into A-FILE-NAME.\n"); printf ("\n"); + #if 0 /* --split-merged-entry is now on by default. */ printf ("Operation modifiers:\n"); printf ("\ --split-merged-entry Possibly split a merged entry between paragraphs.\n\ @@ -955,6 +956,7 @@ newline, just because they happened on the same\n\ date.\n"); printf ("\n"); + #endif printf ("Informative output:\n"); printf (" -h, --help display this help and exit\n"); printf (" -V, --version output version information and exit\n"); @@ -980,7 +982,7 @@ /* Set default values for variables. */ do_help = false; do_version = false; - split_merged_entry = false; + split_merged_entry = true; /* Parse command line options. */ while ((optchar = getopt_long (argc, argv, "hV", long_options, NULL)) != EOF) @@ -995,7 +997,6 @@ do_version = true; break; case CHAR_MAX + 1: /* --split-merged-entry */ - split_merged_entry = true; break; default: usage (EXIT_FAILURE);