From e967460a14f47cdab5ff7d71fbcaee71e00c330b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 23 May 2010 18:03:16 +0200 Subject: [PATCH] git-merge-changelog: Enable --split-merged-entry by default. --- ChangeLog | 7 +++++++ lib/git-merge-changelog.c | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40fe5974af..e7ab8ad1a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-05-23 Bruno Haible + + 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 test-pwrite: do not leave behind a test file named "out" diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c index b9ab42947b..999407a0c2 100644 --- 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 + Copyright (C) 2008-2010 Bruno Haible 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 @@ usage (int status) 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 @@ usage (int status) 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 @@ main (int argc, char *argv[]) /* 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 @@ main (int argc, char *argv[]) do_version = true; break; case CHAR_MAX + 1: /* --split-merged-entry */ - split_merged_entry = true; break; default: usage (EXIT_FAILURE); -- 2.30.2