diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:41:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:41:13 -0800 |
| commit | 94fdb6f6ebcfe2842e8648dd88389e2e850723e9 (patch) | |
| tree | 62d85d3339367019cb23c3c6d99e6aae0e8c6945 /contrib | |
| parent | commit.c: Remove backward goto in read_craft_line() (diff) | |
| parent | Merge branch 'maint-1.7.2' into maint (diff) | |
| download | tgif-94fdb6f6ebcfe2842e8648dd88389e2e850723e9.tar.xz | |
Merge branch 'maint'
* maint:
add: introduce add.ignoreerrors synonym for add.ignore-errors
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f71046947f..604fa794cc 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -261,7 +261,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)..." || |