[PATCH v2 07/12] merge, pull: mark '--(no-)summary' options as deprecated

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

Also remove them from bash completion.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 Documentation/git-merge.txt            |    4 ++--
 Documentation/merge-options.txt        |   10 ++++++++--
 contrib/completion/git-completion.bash |    2 +-
 git-merge.sh                           |    4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c514e3b..2f9edd8 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -9,8 +9,8 @@ git-merge - Join two or more development histories together
 SYNOPSIS
 --------
 [verse]
-'git-merge' [-n | --no-stat | --no-summary] [--stat | --summary] [--no-commit]
-	[--squash] [-s <strategy>]... [-m <msg>] <remote> <remote>...
+'git-merge' [-n | --no-stat] [--stat] [--no-commit] [--squash]
+	[-s <strategy>]... [-m <msg>] <remote> <remote>...
 'git-merge' <msg> HEAD <remote>...
 
 DESCRIPTION
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 41ef152..d0a2ac9 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -1,11 +1,17 @@
---stat, \--summary::
+--stat::
 	Show a diffstat at the end of the merge. The diffstat is also
 	controlled by the configuration option merge.stat (and the
 	equivalent merge.diffstat).
 
--n, \--no-stat, \--no-summary::
+-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/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ef7bf44..adc1a75 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -779,7 +779,7 @@ _git_merge ()
 		;;
 	--*)
 		__gitcomp "
-			--no-commit --no-stat --no-summary --log --no-log
+			--no-commit --no-stat --log --no-log
 			--squash --strategy
 			"
 		return
diff --git a/git-merge.sh b/git-merge.sh
index 4cda3ec..f0b764f 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -10,8 +10,8 @@ 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              equivalent to --stat
-no-summary           equivalent to --no-stat
+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
-- 
1.5.5.76.g546c