Skip to content

Commit b0d66b5

Browse files
committed
Sync with maint
2 parents 0364bb1 + d1ba7a4 commit b0d66b5

File tree

3 files changed

+31
-4
lines changed

3 files changed

+31
-4
lines changed

Documentation/RelNotes/1.7.9.2.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Git v1.7.9.2 Release Notes
2+
==========================
3+
4+
Fixes since v1.7.9.1
5+
--------------------
6+
7+
* The error message emitted when we see an empty loose object was
8+
not phrased correctly.
9+
10+
* The code to ask for password did not fall back to the terminal
11+
input when GIT_ASKPASS is set but does not work (e.g. lack of X
12+
with GUI askpass helper).
13+
14+
* map_user() was not rewriting its output correctly, which resulted
15+
in the user visible symptom that "git blame -e" sometimes showed
16+
excess '>' at the end of email addresses.
17+
18+
* "git checkout -b" did not allow switching out of an unborn branch.
19+
20+
* "git commit" refused to create a commit when entries added with
21+
"add -N" remained in the index, without telling Git what their content
22+
in the next commit should be. We should have created the commit without
23+
these paths.
24+
25+
* Search box in "gitweb" did not accept non-ASCII characters correctly.
26+
27+
Also contains minor fixes and documentation updates.

Documentation/git.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ git - the stupid content tracker
99
SYNOPSIS
1010
--------
1111
[verse]
12-
'git' [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
12+
'git' [--version] [--help] [-c <name>=<value>]
13+
[--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
1314
[-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
1415
[--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
15-
[-c <name>=<value>]
16-
[--help] <command> [<args>]
16+
<command> [<args>]
1717

1818
DESCRIPTION
1919
-----------

contrib/completion/git-completion.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@ _git_branch ()
11371137
__gitcomp "
11381138
--color --no-color --verbose --abbrev= --no-abbrev
11391139
--track --no-track --contains --merged --no-merged
1140-
--set-upstream --edit-description
1140+
--set-upstream --edit-description --list
11411141
"
11421142
;;
11431143
*)

0 commit comments

Comments
 (0)