From a7fab08b6e18b63c1fa6be5047205caa88766773 Mon Sep 17 00:00:00 2001 From: Ralf Thielow Date: Wed, 15 Feb 2012 21:36:58 +0100 Subject: [PATCH 1/3] completion: --list option for git-branch Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a2965f7c6d..91c7acbbb4 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1152,7 +1152,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 " ;; *) From 68e4b552a1b82343bcefa5d68fa344314b150cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 15 Feb 2012 00:54:21 +0100 Subject: [PATCH 2/3] man: rearrange git synopsis to fit in 80 lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The line was extended in 2dd8c3 ('git: add --info-path and --man-path options'), and the formatted man output stopped fitting into the 80 column window. Signed-off-by: Zbigniew Jędrzejewski-Szmek Signed-off-by: Junio C Hamano --- Documentation/git.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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[=]] [--html-path] [--man-path] [--info-path] +'git' [--version] [--help] [-c =] + [--exec-path[=]] [--html-path] [--man-path] [--info-path] [-p|--paginate|--no-pager] [--no-replace-objects] [--bare] [--git-dir=] [--work-tree=] [--namespace=] - [-c =] - [--help] [] + [] DESCRIPTION ----------- From d1ba7a4cb77b64993a56b06c1497d1ab78094cc4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 16 Feb 2012 14:26:32 -0800 Subject: [PATCH 3/3] Update draft release notes to 1.7.9.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.9.2.txt | 27 +++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.7.9.2.txt 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/RelNotes b/RelNotes index d69b2c37ac..47d7319392 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.9.1.txt \ No newline at end of file +Documentation/RelNotes/1.7.9.2.txt \ No newline at end of file