Git 1.8.2.3

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

diff --git a/Documentation/RelNotes/1.8.2.3.txt b/Documentation/RelNotes/1.8.2.3.txt
new file mode 100644 (file)
index 0000000..6139482
--- /dev/null
+++ b/Documentation/RelNotes/1.8.2.3.txt
@@ -0,0 +1,19 @@
+Git v1.8.2.3 Release Notes
+==========================
+
+Fixes since v1.8.2.2
+--------------------
+
+ * "rev-list --stdin" and friends kept bogus pointers into the input
+   buffer around as human readable object names.  This was not a
+   huge problem but was exposed by a new change that uses these
+   names in error output.
+
+ * When "git difftool" drove "kdiff3", it mistakenly passed --auto
+   option that was meant while resolving merge conflicts.
+
+ * "git remote add" command did not diagnose extra command line
+   arguments as an error and silently ignored them.
+
+Also contains a handful of trivial code clean-ups, documentation
+updates, updates to the test suite, etc.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8438c076c3385246e5d381ce8323d50b6d72211a..9e302b0a60552c4297cb94018dad49169505bd35 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.8.2.2/git.html[documentation for release 1.8.2.2]
+* link:v1.8.2.3/git.html[documentation for release 1.8.2.3]
 
 * release notes for
+  link:RelNotes/1.8.2.3.txt[1.8.2.3].
   link:RelNotes/1.8.2.2.txt[1.8.2.2].
   link:RelNotes/1.8.2.1.txt[1.8.2.1].
   link:RelNotes/1.8.2.txt[1.8.2].

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7186e774a89e949ad30cbb3aaa931ee08ead8265..f7ec14ad92da1c25274bd8e65033c6eeb21137e9 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.2.2
+DEF_VER=v1.8.2.3
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 1566ea44df08688bcd83c22edce60af0deb3299f..155555ef6af91ee7309a047f8280c1c57cac1e62 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.8.2.2.txt
\ No newline at end of file
+Documentation/RelNotes/1.8.2.3.txt
\ No newline at end of file