diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-06 14:30:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-06 14:30:49 -0700 |
| commit | c42b5d8e69ba45b00d1681745a72c1d3af1e897f (patch) | |
| tree | 938b27aab5307c617feb98c080c74a4bfdfebd88 /Documentation | |
| parent | Merge branch 'sb/submodule-helper-relative-path' (diff) | |
| parent | Git 2.8.4 (diff) | |
| download | tgif-c42b5d8e69ba45b00d1681745a72c1d3af1e897f.tar.xz | |
Sync with 2.8.4
* maint:
Git 2.8.4
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/2.8.4.txt | 14 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.8.4.txt b/Documentation/RelNotes/2.8.4.txt index 8d484b170a..f4e2552836 100644 --- a/Documentation/RelNotes/2.8.4.txt +++ b/Documentation/RelNotes/2.8.4.txt @@ -52,4 +52,18 @@ Fixes since v2.8.3 result in a strange error message in a pathological corner case. This has been corrected to suggest "submodule deinit --all" instead. + * Many commands normalize command line arguments from NFD to NFC + variant of UTF-8 on OSX, but commands in the "diff" family did + not, causing "git diff $path" to complain that no such path is + known to Git. They have been taught to do the normalization. + + * A couple of bugs around core.autocrlf have been fixed. + + * "git difftool" learned to handle unmerged paths correctly in + dir-diff mode. + + * The "are we talking with TTY, doing an interactive session?" + detection has been updated to work better for "Git for Windows". + + Also contains other minor documentation updates and code clean-ups. diff --git a/Documentation/git.txt b/Documentation/git.txt index dd6dbf7dd9..5a10e9b4a0 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.8.3/git.html[documentation for release 2.8.3] +* link:v2.8.4/git.html[documentation for release 2.8.4] * release notes for + link:RelNotes/2.8.4.txt[2.8.4], link:RelNotes/2.8.3.txt[2.8.3], link:RelNotes/2.8.2.txt[2.8.2], link:RelNotes/2.8.1.txt[2.8.1], |