summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-14 15:46:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-14 15:46:23 (GMT)
commitbdff0e3a374617dce784f801b97500d9ba2e4705 (patch)
treeb4d969695a5ee49e325b535ea9742c0cf819c4fb /contrib/completion
parent908b3601e67e21996c1df5807761f42dcd72c2c5 (diff)
parent5269f7f8c6b293f1568c4f03c14596835e22df31 (diff)
downloadgit-bdff0e3a374617dce784f801b97500d9ba2e4705.zip
git-bdff0e3a374617dce784f801b97500d9ba2e4705.tar.gz
git-bdff0e3a374617dce784f801b97500d9ba2e4705.tar.bz2
Merge branch 'rr/complete-difftool-fixup'
"git difftool" can take both revs to be compared and pathspecs. "git show" takes revs, revs:path and pathspecs. * rr/complete-difftool-fixup: completion: show can take both revlist and paths completion: difftool takes both revs and files
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-completion.bash4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 56c52c6..fd9a1d5 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1211,7 +1211,7 @@ _git_difftool ()
return
;;
esac
- __git_complete_file
+ __git_complete_revlist_file
}
__git_fetch_options="
@@ -2277,7 +2277,7 @@ _git_show ()
return
;;
esac
- __git_complete_file
+ __git_complete_revlist_file
}
_git_show_branch ()