Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Update draft release notes to 1.8.3.3
  git-config: update doc for --get with multiple values
  • Loading branch information
Junio C Hamano committed Jul 3, 2013
2 parents 0e7c41c + 81a199b commit 56df44a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
15 changes: 15 additions & 0 deletions Documentation/RelNotes/1.8.3.3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,23 @@ Git v1.8.3.3 Release Notes
Fixes since v1.8.3.2
--------------------

* "gitweb" forgot to clear a global variable $search_regexp upon each
request, mistakenly carrying over the previous search to a new one
when used as a persistent CGI.

* The wildmatch engine did not honor WM_CASEFOLD option correctly.

* "git log -c --follow $path" segfaulted upon hitting the commit that
renamed the $path being followed.

* When a reflog notation is used for implicit "current branch",
e.g. "git log @{u}", we did not say which branch and worse said
"branch ''" in the error messages.

* Mac OS X does not like to write(2) more than INT_MAX number of
bytes; work it around by chopping write(2) into smaller pieces.

* Newer MacOS X encourages the programs to compile and link with
their CommonCrypto, not with OpenSSL.

Also contains various minor documentation updates.
2 changes: 1 addition & 1 deletion Documentation/git-config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ OPTIONS
--get::
Get the value for a given key (optionally filtered by a regex
matching the value). Returns error code 1 if the key was not
found and error code 2 if multiple key values were found.
found and the last value if multiple key values were found.

--get-all::
Like get, but does not fail if the number of values for the key
Expand Down

0 comments on commit 56df44a

Please sign in to comment.