Sync with maint

This commit is contained in:
Junio C Hamano 2012-02-16 14:27:20 -08:00
commit b0d66b5110
3 changed files with 31 additions and 4 deletions

View File

@ -0,0 +1,27 @@
Git v1.7.9.2 Release Notes
==========================
Fixes since v1.7.9.1
--------------------
* The error message emitted when we see an empty loose object was
not phrased correctly.
* The code to ask for password did not fall back to the terminal
input when GIT_ASKPASS is set but does not work (e.g. lack of X
with GUI askpass helper).
* map_user() was not rewriting its output correctly, which resulted
in the user visible symptom that "git blame -e" sometimes showed
excess '>' at the end of email addresses.
* "git checkout -b" did not allow switching out of an unborn branch.
* "git commit" refused to create a commit when entries added with
"add -N" remained in the index, without telling Git what their content
in the next commit should be. We should have created the commit without
these paths.
* Search box in "gitweb" did not accept non-ASCII characters correctly.
Also contains minor fixes and documentation updates.

View File

@ -9,11 +9,11 @@ git - the stupid content tracker
SYNOPSIS
--------
[verse]
'git' [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
'git' [--version] [--help] [-c <name>=<value>]
[--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
[-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
[--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
[-c <name>=<value>]
[--help] <command> [<args>]
<command> [<args>]
DESCRIPTION
-----------

View File

@ -1137,7 +1137,7 @@ _git_branch ()
__gitcomp "
--color --no-color --verbose --abbrev= --no-abbrev
--track --no-track --contains --merged --no-merged
--set-upstream --edit-description
--set-upstream --edit-description --list
"
;;
*)