X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fcompletion%2Fgit-completion.bash;h=d3037fc94eb027e5067b0371da2b33081fd89da5;hb=54d04f2b077496739f9fdf04ff8abf24feb33576;hp=67569901e71e5062199e48304afc424f15b57ba1;hpb=165dc789d5e201a06e0de5a984e4529ae62027fc;p=git.git diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 67569901e..d3037fc94 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -255,7 +255,7 @@ __git_ps1 () (describe) git describe HEAD ;; (* | default) - git describe --exact-match HEAD ;; + git describe --tags --exact-match HEAD ;; esac 2>/dev/null)" || b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." || @@ -1125,7 +1125,7 @@ _git_diff () case "$cur" in --*) __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex - --base --ours --theirs + --base --ours --theirs --no-index $__git_diff_common_options " return