From: SZEDER Gábor Date: Wed, 16 Apr 2008 00:39:10 GMT Subject: [PATCH v2 11/12] merge, pull: remove deprecated 'merge.diffstat' config variable Message-ID: <1208306351-20922-12-git-send-email-szeder@ira.uka.de> In-Reply-To: <1208306351-20922-11-git-send-email-szeder@ira.uka.de> Signed-off-by: SZEDER Gábor --- Documentation/merge-config.txt | 3 --- Documentation/merge-options.txt | 3 +-- git-merge.sh | 1 - 3 files changed, 1 insertions(+), 6 deletions(-) diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 45b107d..896f914 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -2,9 +2,6 @@ merge.stat:: Whether to print the diffstat berween ORIG_HEAD and merge result at the end of the merge. True by default. -merge.diffstat:: - Deprecated equivalent of merge.stat. - merge.log:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index f22fc6e..0333913 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -1,7 +1,6 @@ --stat:: Show a diffstat at the end of the merge. The diffstat is also - controlled by the configuration option merge.stat (and the - deprecated merge.diffstat). + controlled by the configuration option merge.stat. -n, \--no-stat:: Do not show diffstat at the end of the merge. diff --git a/git-merge.sh b/git-merge.sh index 263b337..db79851 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -213,7 +213,6 @@ parse_config "$@" while test $args_left -lt $#; do shift; done if test -z "$show_diffstat"; then - test "$(git config --bool merge.diffstat)" = false && show_diffstat=false test "$(git config --bool merge.stat)" = false && show_diffstat=false test -z "$show_diffstat" && show_diffstat=t fi -- 1.5.5.76.g546c