diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f6e939ab5..6ffbc8c77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-04-25 Frank Terbeck <ft@bewatermyfriend.org> + + * Felipe Contreras: 29028: Completion/Unix/Command/_git: Add + useful completion for `gitk'. + 2011-04-24 Barton E. Schaefer <schaefer@zsh.org> * Jun T.: 29031: Src/Zle/complist.c: increment global minfo @@ -14508,5 +14513,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5260 $ +* $Revision: 1.5261 $ ***************************************************** diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 37ea3383a..0a7128087 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1,4 +1,4 @@ -#compdef git git-cvsserver git-receive-pack git-upload-archive git-upload-pack git-shell +#compdef git git-cvsserver git-receive-pack git-upload-archive git-upload-pack git-shell gitk # Some parts of this completion's behaviour are configurable: # @@ -4466,8 +4466,7 @@ _git_commands () { stash:'stash away changes to dirty working directory' status:'show working-tree status' submodule:'initialize, update, or inspect submodules' - tag:'create, list, delete or verify tag object signed with GPG' - gitk:'brows the repository interactively') + tag:'create, list, delete or verify tag object signed with GPG') local -a ancillary_manipulator_commands ancillary_manipulator_commands=( @@ -5962,6 +5961,11 @@ __git_color_attributes () { _describe -t attributes attribute attributes $* } +(( $+functions[_gitk] )) || +_gitk () { + _git-log +} + # Now, for the main driver… _git() { if (( CURRENT > 2 )); then |