# [PATCH] bash completion: difftool accepts the same options as diff 2 messages from 2009-10-28 to 2009-10-28. Participants: Markus Heidelberg, Shawn O. Pearce. Thread: https://gitlist.dev/t/21400 ## Markus Heidelberg, 2009-10-28 09:45 Subject: [PATCH] bash completion: difftool accepts the same options as diff Message-ID: <1256723138-1480-1-git-send-email-markus.heidelberg@web.de> URL: https://gitlist.dev/e/1256723138-1480-1-git-send-email-markus.heidelberg%40web.de ``` So complete refs, files after the doubledash and some diff options that make sense for difftool. Signed-off-by: Markus Heidelberg --- contrib/completion/git-completion.bash | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d3fec32..45369e2 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -958,6 +958,8 @@ __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff _git_difftool () { + __git_has_doubledash && return + local cur="${COMP_WORDS[COMP_CWORD]}" case "$cur" in --tool=*) @@ -965,11 +967,15 @@ _git_difftool () return ;; --*) - __gitcomp "--tool=" + __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex + --base --ours --theirs + --no-renames --diff-filter= --find-copies-harder + --relative --ignore-submodules + --tool=" return ;; esac - COMPREPLY=() + __git_complete_file } __git_fetch_options=" -- 1.6.5.2.86.g61663 ``` ## Shawn O. Pearce, 2009-10-28 14:32 Subject: Re: [PATCH] bash completion: difftool accepts the same options as diff Message-ID: <20091028143254.GQ10505@spearce.org> URL: https://gitlist.dev/e/20091028143254.GQ10505%40spearce.org In-Reply-To: <1256723138-1480-1-git-send-email-markus.heidelberg@web.de> ``` Markus Heidelberg wrote: > So complete refs, files after the doubledash and some diff options that > make sense for difftool. > > Signed-off-by: Markus Heidelberg Acked-by: Shawn O. Pearce > contrib/completion/git-completion.bash | 10 ++++++++-- > 1 files changed, 8 insertions(+), 2 deletions(-) -- Shawn. ```