diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-23 01:49:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 01:49:02 (GMT) |
| commit | f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb (patch) | |
| tree | ad5d2c598d006469bf3517e7ea39a10c3fb04e96 | |
| parent | 41799aa20904ff532ceb4f3ed95ba13e164dfc7a (diff) | |
| parent | 78f4c9f62549fdd9a52550449c4e3148e7e0900d (diff) | |
| download | git-f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb.zip git-f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb.tar.gz git-f1f1b96e99fa064ed9f0da263d4b4eb0407b3ceb.tar.bz2 | |
Sync with 1.7.9.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | contrib/completion/git-completion.bash | 20 |
2 files changed, 6 insertions, 17 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index d8a13bf..22fadeb 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -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]. diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3a05a5b..554e30e 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 |