summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-01 16:40:26 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-01 16:40:26 -0800
commit5501bf854ce6a3847ef0de6f6aa63f6b93e82b67 (patch)
tree207af060fbb0f8ce50f93cd1cc8c73d049729ce1 /contrib
parent16529f2e5630d3d155e4dff0ebd3c7c5daa882f9 (diff)
parent2de132f8844f3b1b3c9f898e48829630d0cabb07 (diff)
downloadgit-5501bf854ce6a3847ef0de6f6aa63f6b93e82b67.tar.gz
Merge branch 'maint-1.7.2' into maint
* maint-1.7.2: 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-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index f83f019ca9..d3037fc94e 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)..." ||