diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:18:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-12 14:18:34 -0800 |
| commit | 577aed296a8d6dbc0747982c0a7d14bf543c67fa (patch) | |
| tree | b6fc45e7978010be15f34646dacb7cac1bd2fbe5 /contrib | |
| parent | df5f0ad2519b0951c127f3b38a9884862586cc83 (diff) | |
| parent | 15a42a10ec71eb18983750562a2a8a43b224fef0 (diff) | |
| download | git-577aed296a8d6dbc0747982c0a7d14bf543c67fa.tar.gz | |
Merge branch 'jk/remove-deprecated'
* jk/remove-deprecated:
stop installing git-tar-tree link
peek-remote: remove deprecated alias of ls-remote
lost-found: remove deprecated command
tar-tree: remove deprecated command
repo-config: remove deprecated alias for "git config"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 | ||||
| -rwxr-xr-x | contrib/examples/git-whatchanged.sh | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index dba3c15700..874611db56 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -673,7 +673,6 @@ __git_list_porcelain_commands () index-pack) : plumbing;; init-db) : deprecated;; local-fetch) : plumbing;; - lost-found) : infrequent;; ls-files) : plumbing;; ls-remote) : plumbing;; ls-tree) : plumbing;; @@ -687,14 +686,12 @@ __git_list_porcelain_commands () pack-refs) : plumbing;; parse-remote) : plumbing;; patch-id) : plumbing;; - peek-remote) : plumbing;; prune) : plumbing;; prune-packed) : plumbing;; quiltimport) : import;; read-tree) : plumbing;; receive-pack) : plumbing;; remote-*) : transport;; - repo-config) : deprecated;; rerere) : plumbing;; rev-list) : plumbing;; rev-parse) : plumbing;; @@ -707,7 +704,6 @@ __git_list_porcelain_commands () ssh-*) : transport;; stripspace) : plumbing;; symbolic-ref) : plumbing;; - tar-tree) : deprecated;; unpack-file) : plumbing;; unpack-objects) : plumbing;; update-index) : plumbing;; diff --git a/contrib/examples/git-whatchanged.sh b/contrib/examples/git-whatchanged.sh index 1fb9feb348..2edbdc6d99 100755 --- a/contrib/examples/git-whatchanged.sh +++ b/contrib/examples/git-whatchanged.sh @@ -9,12 +9,12 @@ case "$0" in *whatchanged) count= test -z "$diff_tree_flags" && - diff_tree_flags=$(git-repo-config --get whatchanged.difftree) + diff_tree_flags=$(git config --get whatchanged.difftree) diff_tree_default_flags='-c -M --abbrev' ;; *show) count=-n1 test -z "$diff_tree_flags" && - diff_tree_flags=$(git-repo-config --get show.difftree) + diff_tree_flags=$(git config --get show.difftree) diff_tree_default_flags='--cc --always' ;; esac test -z "$diff_tree_flags" && |