Git 2.8.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.8.4.txt b/Documentation/RelNotes/2.8.4.txt
index 8d484b170ac7c96cfa1366d0f569ea1e2065cabe..f4e255283667e958a5b6d321bb30cc914a3cd94b 100644 (file)
--- 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.
 
    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.
 Also contains other minor documentation updates and code clean-ups.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index dd6dbf7dd909bb14300706bfdc7ea83a164998d2..5a10e9b4a06cbf34ff3d15032fe7f7d13ed0c3ba 100644 (file)
--- 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:
 
 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
 
 * 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],
   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],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 596965a4de6c3d965a6967a2ed94eb79eb762b5f..ba8b8cf3c660e043a286af594a9ec5044396821c 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.8.3
+DEF_VER=v2.8.4

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index eb82eea64fef8ce0d4bcd18e4daab09aa53e026a..58fee1e34792b2ea17b214200742c5776804b1d6 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.8.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.8.4.txt
\ No newline at end of file