diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-03-26 13:14:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-26 13:14:45 -0700 |
commit | 7f95f2dce01e03532206d0998bca4cbdd8a660c7 (patch) | |
tree | 61acc75243b55689d3018777df7ea2f7b1feda48 | |
parent | Second wave of topics toward 1.8.3 (diff) | |
parent | More corrections for 1.8.2.1 (diff) | |
download | tgif-7f95f2dce01e03532206d0998bca4cbdd8a660c7.tar.xz |
Merge branch 'maint'
* maint:
More corrections for 1.8.2.1
Correct the docs about GIT_SSH.
-rw-r--r-- | Documentation/RelNotes/1.8.2.1.txt | 39 | ||||
-rw-r--r-- | Documentation/git.txt | 9 |
2 files changed, 45 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt index e77f8333ea..23977562a9 100644 --- a/Documentation/RelNotes/1.8.2.1.txt +++ b/Documentation/RelNotes/1.8.2.1.txt @@ -4,6 +4,45 @@ Git v1.8.2.1 Release Notes Fixes since v1.8.2 ------------------ + * "git submodule update", when recursed into sub-submodules, did not + acccumulate the prefix paths. + + * "git am $maildir/" applied messages in an unexpected order; sort + filenames read from the maildir/ in a way that is more likely to + sort messages in the order the writing MUA meant to, by sorting + numeric segment in numeric order and non-numeric segment in + alphabetical order. + + * When export-subst is used, "zip" output recorded incorrect + size of the file. + + * Some platforms and users spell UTF-8 differently; retry with the + most official "UTF-8" when the system does not understand the + user-supplied encoding name that are the common alternative + spellings of UTF-8. + + * "git branch" did not bother to check nonsense command line + parameters and issue errors in many cases. + + * "git update-index -h" did not do the usual "-h(elp)" thing. + + * perl/Git.pm::cat_blob slurped everything in core only to write it + out to a file descriptor, which was not a very smart thing to do. + + * The SSL peer verification done by "git imap-send" did not ask for + Server Name Indication (RFC 4366), failing to connect SSL/TLS + sites that serve multiple hostnames on a single IP. + + * "git index-pack" had a buffer-overflow while preparing an + informational message when the translated version of it was too + long. + + * Clarify in the documentation "what" gets pushed to "where" when the + command line to "git push" does not say these explicitly. + + * In "git reflog expire", REACHABLE bit was not cleared from the + correct objects. + * The "--color=<when>" argument to the commands in the diff family was described poorly. diff --git a/Documentation/git.txt b/Documentation/git.txt index 7efaa591b8..4307d62bd4 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -774,9 +774,12 @@ other If this environment variable is set then 'git fetch' and 'git push' will use this command instead of 'ssh' when they need to connect to a remote system. - The '$GIT_SSH' command will be given exactly two arguments: - the 'username@host' (or just 'host') from the URL and the - shell command to execute on that remote system. + The '$GIT_SSH' command will be given exactly two or + four arguments: the 'username@host' (or just 'host') + from the URL and the shell command to execute on that + remote system, optionally preceded by '-p' (literally) and + the 'port' from the URL when it specifies something other + than the default SSH port. + To pass options to the program that you want to list in GIT_SSH you will need to wrap the program and options into a shell script, |