Skip to content

Commit f1f1b96

Browse files
committed
Sync with 1.7.9.2
Signed-off-by: Junio C Hamano <[email protected]>
2 parents 41799aa + 78f4c9f commit f1f1b96

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

Documentation/git.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
4444
branch of the `git.git` repository.
4545
Documentation for older releases are available here:
4646

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

4949
* release notes for
50+
link:RelNotes/1.7.9.2.txt[1.7.9.2],
5051
link:RelNotes/1.7.9.1.txt[1.7.9.1],
5152
link:RelNotes/1.7.9.txt[1.7.9].
5253

contrib/completion/git-completion.bash

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@
6060
# per-repository basis by setting the bash.showUpstream config
6161
# variable.
6262
#
63-
#
64-
# To submit patches:
65-
#
66-
# *) Read Documentation/SubmittingPatches
67-
# *) Send all patches to the current maintainer:
68-
#
69-
# "Shawn O. Pearce" <[email protected]>
70-
#
71-
# *) Always CC the Git mailing list:
72-
#
73-
74-
#
7563

7664
if [[ -n ${ZSH_VERSION-} ]]; then
7765
autoload -U +X bashcompinit && bashcompinit
@@ -298,13 +286,13 @@ __git_ps1 ()
298286
fi
299287
fi
300288
if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then
301-
git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
289+
git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$"
302290
fi
303291

304292
if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then
305-
if [ -n "$(git ls-files --others --exclude-standard)" ]; then
306-
u="%"
307-
fi
293+
if [ -n "$(git ls-files --others --exclude-standard)" ]; then
294+
u="%"
295+
fi
308296
fi
309297

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

0 commit comments

Comments
 (0)