Skip to content

Commit

Permalink
Sync with 1.7.9.2
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
gitster committed Feb 23, 2012
2 parents 41799aa + 78f4c9f commit f1f1b96
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:

* link:v1.7.9.1/git.html[documentation for release 1.7.9.1]
* link:v1.7.9.2/git.html[documentation for release 1.7.9.2]

* release notes for
link:RelNotes/1.7.9.2.txt[1.7.9.2],
link:RelNotes/1.7.9.1.txt[1.7.9.1],
link:RelNotes/1.7.9.txt[1.7.9].

Expand Down
20 changes: 4 additions & 16 deletions contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,6 @@
# per-repository basis by setting the bash.showUpstream config
# variable.
#
#
# To submit patches:
#
# *) Read Documentation/SubmittingPatches
# *) Send all patches to the current maintainer:
#
# "Shawn O. Pearce" <[email protected]>
#
# *) Always CC the Git mailing list:
#
# [email protected]
#

if [[ -n ${ZSH_VERSION-} ]]; then
autoload -U +X bashcompinit && bashcompinit
Expand Down Expand Up @@ -298,13 +286,13 @@ __git_ps1 ()
fi
fi
if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
fi

if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
if [ -n "$(git ls-files --others --exclude-standard)" ]; then
u="%"
fi
if [ -n "$(git ls-files --others --exclude-standard)" ]; then
u="%"
fi
fi

if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
Expand Down

0 comments on commit f1f1b96

Please sign in to comment.