Documentation: remove {show,whatchanged}.difftree config options

This removes, from the documentation and the bash completion script, the
two config options that were introduced by the git-whatchanged.sh script
and lost in the C rewrite. Today, we can use aliases as an alternative.

Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 90c8a45a2f8dc70e61b32d5e3e10d7054c67e3ad..6966384cefcb53edb9d74f59139d3b37f849ad23 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1007,10 +1007,6 @@ repack.usedeltabaseoffset::
        Allow linkgit:git-repack[1] to create packs that uses
        delta-base offset.  Defaults to false.
 
        Allow linkgit:git-repack[1] to create packs that uses
        delta-base offset.  Defaults to false.
 

-show.difftree::
-       The default linkgit:git-diff-tree[1] arguments to be used
-       for linkgit:git-show[1].
-

 showbranch.default::
        The default set of branches for linkgit:git-show-branch[1].
        See linkgit:git-show-branch[1].
 showbranch.default::
        The default set of branches for linkgit:git-show-branch[1].
        See linkgit:git-show-branch[1].


@@ -1075,10 +1071,6 @@ user.signingkey::
        unchanged to gpg's --local-user parameter, so you may specify a key
        using any method that gpg supports.
 
        unchanged to gpg's --local-user parameter, so you may specify a key
        using any method that gpg supports.
 

-whatchanged.difftree::
-       The default linkgit:git-diff-tree[1] arguments to be used
-       for linkgit:git-whatchanged[1].
-

 imap::
        The configuration variables in the 'imap' section are described
        in linkgit:git-imap-send[1].
 imap::
        The configuration variables in the 'imap' section are described
        in linkgit:git-imap-send[1].

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ebf7cde5c023c86ee7ed0751730e09d1245930da..3f46149853237fcded15d498f94b4ae3b174b79c 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1041,7 +1041,6 @@ _git_config ()
                pull.octopus
                pull.twohead
                repack.useDeltaBaseOffset
                pull.octopus
                pull.twohead
                repack.useDeltaBaseOffset

-               show.difftree

                showbranch.default
                tar.umask
                transfer.unpackLimit
                showbranch.default
                tar.umask
                transfer.unpackLimit


@@ -1050,7 +1049,6 @@ _git_config ()
                user.name
                user.email
                user.signingkey
                user.name
                user.email
                user.signingkey

-               whatchanged.difftree

                branch. remote.
        "
 }
                branch. remote.
        "
 }