[PATCH v5 4/5] fmt-merge-msg: Remove deprecated '--summary' option

[Ramkumar Ramachandra <artagnon@gmail.com>]

Remove the deprecated '--summary' option that served as a syonym to
the '--log' option. Also update the documentation accordingly.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 Documentation/git-fmt-merge-msg.txt |    9 ---------
 Documentation/merge-options.txt     |    5 -----
 builtin/fmt-merge-msg.c             |    5 +----
 builtin/merge.c                     |    2 +-
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 5954a53..a0eb7e2 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -35,11 +35,6 @@ OPTIONS
 	Do not list one-line descriptions from the actual commits being
 	merged.
 
---summary::
---no-summary::
-	Synonyms to --log and --no-log; these are deprecated and will be
-	removed in the future.
-
 -m <message>::
 --message <message>::
 	Use <message> instead of the branch names for the first line
@@ -57,10 +52,6 @@ merge.log::
 	Whether to include summaries of merged commits in newly
 	merge commit messages. False by default.
 
-merge.summary::
-	Synonym to `merge.log`; this is deprecated and will be removed in
-	the future.
-
 SEE ALSO
 --------
 linkgit:git-merge[1]
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 1083f19..8001005 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -67,11 +67,6 @@ option can be used to override --squash.
 	Pass merge strategy specific option through to the merge
 	strategy.
 
---summary::
---no-summary::
-	Synonyms to --stat and --no-stat; these are deprecated and will be
-	removed in the future.
-
 ifndef::git-pull[]
 -q::
 --quiet::
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 6a2c9c8..4255890 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -15,7 +15,7 @@ static int shortlog_len;
 
 static int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 {
-	if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
+	if (!strcmp(key, "merge.log")) {
 		int is_bool;
 		shortlog_len = git_config_bool_or_int(key, value, &is_bool);
 		if (is_bool && shortlog_len)
@@ -320,9 +320,6 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 		{ OPTION_INTEGER, 0, "log", &shortlog_len, "n",
 		  "populate log with <n> entries from shortlog",
 		  PARSE_OPT_OPTARG, NULL, 20 },
-		{ OPTION_INTEGER, 0, "summary", &shortlog_len, "n",
-                  "alias for --log (deprecated)",
-		  PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, NULL, 20 },
 		OPT_STRING('m', "message", &message, "text",
 			"use <text> as start of message"),
 		OPT_FILENAME('F', "file", &inpath, "file to read from"),
diff --git a/builtin/merge.c b/builtin/merge.c
index 78d6c69..9196428 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -505,7 +505,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)
 		return git_config_string(&pull_twohead, k, v);
 	else if (!strcmp(k, "pull.octopus"))
 		return git_config_string(&pull_octopus, k, v);
-	else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary")) {
+	else if (!strcmp(k, "merge.log")) {
 		int is_bool;
 		shortlog_len = git_config_bool_or_int(k, v, &is_bool);
 		if (is_bool && shortlog_len)
-- 
1.7.2.2.409.gdbb11.dirty