diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3c6b2b467..1c4fc6d33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-05-14 Oliver Kiddle <opk@zsh.org> + * Daniel Hahler: 35062: Completion/Unix/Command/_git: + __git_setup_revision_options includes __git_setup_diff_options + * Daniel Hahler: 35061: Completion/Unix/Command/_git: add __git_setup_diff_stage_options and use it with _git-diff-files and _git-diff explicitly diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 631d2f798..c13ec127a 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1083,12 +1083,10 @@ _git-log () { local -a log_options revision_options diff_options __git_setup_log_options __git_setup_revision_options - __git_setup_diff_options _arguments -w -C -s \ $log_options \ $revision_options \ - $diff_options \ '-L+[trace the evolution of a line range or regex within a file]:range' \ '(-)--[start file arguments]' \ '*:: :->commit-range-or-file' && ret=0 @@ -1486,10 +1484,9 @@ _git-show () { local curcontext=$curcontext state line ret=1 typeset -A opt_args - local -a log_options revision_options diff_options + local -a log_options revision_options __git_setup_log_options __git_setup_revision_options - __git_setup_diff_options _arguments -w -C -s \ $log_options \ |