зеркало из https://github.com/microsoft/git.git
Sync with 1.7.9.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Коммит
f1f1b96e99
|
@ -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].
|
||||
|
||||
|
|
|
@ -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" <spearce@spearce.org>
|
||||
#
|
||||
# *) Always CC the Git mailing list:
|
||||
#
|
||||
# git@vger.kernel.org
|
||||
#
|
||||
|
||||
if [[ -n ${ZSH_VERSION-} ]]; then
|
||||
autoload -U +X bashcompinit && bashcompinit
|
||||
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче