[PATCH v2 10/12] merge, pull: remove deprecated '--(no-)summary' options

["SZEDER Gábor" <szeder@ira.uka.de>]

Also remove related test.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 Documentation/merge-options.txt |    6 ------
 git-merge.sh                    |    6 ++----
 git-pull.sh                     |    4 ++--
 t/t7600-merge.sh                |   15 ---------------
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f282556..f22fc6e 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -6,12 +6,6 @@
 -n, \--no-stat::
 	Do not show diffstat at the end of the merge.
 
---summary::
-	Deprecated equivalent of --stat.
-
---no-summary::
-	Deprecated equivalent of --no-stat.
-
 --log::
 	In addition to branch names, populate the log message with
 	one-line descriptions from the actual commits that are being
diff --git a/git-merge.sh b/git-merge.sh
index f0b764f..263b337 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -10,8 +10,6 @@ git-merge [options] <msg> HEAD <remote>
 --
 stat                 show a diffstat at the end of the merge
 n,no-stat            don't show a diffstat at the end of the merge
-summary              deprecated equivalent of --stat
-no-summary           deprecated equivalent of --no-stat
 log                  add list of one-line log to merge commit message
 no-log               don't add list of one-line log to merge commit message
 squash               create a single commit instead of doing a merge
@@ -152,9 +150,9 @@ merge_name () {
 parse_config () {
 	while test $# != 0; do
 		case "$1" in
-		-n|--no-stat|--no-summary)
+		-n|--no-stat)
 			show_diffstat=false ;;
-		--stat|--summary)
+		--stat)
 			show_diffstat=t ;;
 		--log|--no-log)
 			log_arg=$1 ;;
diff --git a/git-pull.sh b/git-pull.sh
index e344afb..d1edb9c 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -23,9 +23,9 @@ rebase=$(git config --bool branch.$curr_branch_short.rebase)
 while :
 do
 	case "$1" in
-	-n|--no-stat|--no-summary)
+	-n|--no-stat)
 		no_stat=-n ;;
-	--stat|--summary)
+	--stat)
 		no_stat=$1 ;;
 	--log|--no-log)
 		log_arg=$1 ;;
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 6680321..6fc626e 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -383,21 +383,6 @@ test_expect_success 'override config option -n with --stat' '
 
 test_debug 'gitk --all'
 
-test_expect_success 'override config option -n with --summary' '
-	git reset --hard c1 &&
-	git config branch.master.mergeoptions "-n" &&
-	test_tick &&
-	git merge --summary c2 >diffstat.txt &&
-	verify_merge file result.1-5 msg.1-5 &&
-	verify_parents $c1 $c2 &&
-	if ! grep "^ file |  *2 +-$" diffstat.txt
-	then
-		echo "[OOPS] diffstat was not generated"
-	fi
-'
-
-test_debug 'gitk --all'
-
 test_expect_success 'override config option --stat' '
 	git reset --hard c1 &&
 	git config branch.master.mergeoptions "--stat" &&
-- 
1.5.5.76.g546c