summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-16 14:27:20 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-16 14:27:20 -0800
commitb0d66b5110faaeb395610ba43b6eb70a18ab5e25 (patch)
treedc5bacdbbd7ac883afe768aa52005ebca83b2733 /Documentation
parentMerge branch 'jk/git-dir-lookup' (diff)
parentUpdate draft release notes to 1.7.9.2 (diff)
downloadtgif-b0d66b5110faaeb395610ba43b6eb70a18ab5e25.tar.xz
Sync with maint
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.9.2.txt27
-rw-r--r--Documentation/git.txt6
2 files changed, 30 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.9.2.txt b/Documentation/RelNotes/1.7.9.2.txt
new file mode 100644
index 0000000000..5dd06f2177
--- /dev/null
+++ b/Documentation/RelNotes/1.7.9.2.txt
@@ -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.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index a12d15fb98..d8a13bf61c 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -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
-----------