summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Olivier Marin <dkr@freesurf.fr>2008-06-27 02:17:55 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-28 20:55:26 -0700
commit8813df9066427ffe40d1d77d18f20643f396f153 (patch)
tree471fa5f320517ab7246ea3a8f190e9eee727ca4b
parentGIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy (diff)
downloadtgif-8813df9066427ffe40d1d77d18f20643f396f153.tar.xz
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>
-rw-r--r--Documentation/config.txt8
-rwxr-xr-xcontrib/completion/git-completion.bash2
2 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 90c8a45a2f..6966384cef 100644
--- 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.
-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].
@@ -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.
-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].
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ebf7cde5c0..3f46149853 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1041,7 +1041,6 @@ _git_config ()
pull.octopus
pull.twohead
repack.useDeltaBaseOffset
- show.difftree
showbranch.default
tar.umask
transfer.unpackLimit
@@ -1050,7 +1049,6 @@ _git_config ()
user.name
user.email
user.signingkey
- whatchanged.difftree
branch. remote.
"
}