summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-21 12:58:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-21 12:58:50 -0700
commitfb896362cc12dfc0df69be6c9d75936f9c7cc7ff (patch)
tree034f62b74842d30dfa77a98617de4ee7d142a3fc
parentRelNotes: "merge --quiet" change has been reverted (diff)
parentGit 2.3.6 (diff)
downloadtgif-fb896362cc12dfc0df69be6c9d75936f9c7cc7ff.tar.xz
Sync with maint
-rw-r--r--Documentation/RelNotes/2.3.6.txt13
-rw-r--r--Documentation/git.txt3
2 files changed, 15 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.3.6.txt b/Documentation/RelNotes/2.3.6.txt
new file mode 100644
index 0000000000..432f770ef3
--- /dev/null
+++ b/Documentation/RelNotes/2.3.6.txt
@@ -0,0 +1,13 @@
+Git v2.3.6 Release Notes
+========================
+
+Fixes since v2.3.5
+------------------
+
+ * "diff-highlight" (in contrib/) used to show byte-by-byte
+ differences, which meant that multi-byte characters can be chopped
+ in the middle. It learned to pay attention to character boundaries
+ (assuming the UTF-8 payload).
+
+Also contains typofixes, documentation updates and trivial code
+clean-ups.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 59e8335055..e125c4227f 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.3.5/git.html[documentation for release 2.3.5]
+* link:v2.3.6/git.html[documentation for release 2.3.6]
* release notes for
+ link:RelNotes/2.3.6.txt[2.3.6],
link:RelNotes/2.3.5.txt[2.3.5],
link:RelNotes/2.3.4.txt[2.3.4],
link:RelNotes/2.3.3.txt[2.3.3],