summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-07 08:51:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-07 08:51:47 (GMT)
commitb59122f86f23007fce374f92de7f6e0a73793026 (patch)
treea18887ccd7b0299be18e06fcf17f889a3ba87a11
parent919ab6429aab9af44feea0768feef80f3092e9d3 (diff)
downloadgit-b59122f86f23007fce374f92de7f6e0a73793026.zip
git-b59122f86f23007fce374f92de7f6e0a73793026.tar.gz
git-b59122f86f23007fce374f92de7f6e0a73793026.tar.bz2
GIT 1.6.1.3v1.6.1.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.6.1.3.txt32
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 34 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.6.1.3.txt b/Documentation/RelNotes-1.6.1.3.txt
new file mode 100644
index 0000000..6f0bde1
--- /dev/null
+++ b/Documentation/RelNotes-1.6.1.3.txt
@@ -0,0 +1,32 @@
+GIT v1.6.1.3 Release Notes
+==========================
+
+Fixes since v1.6.1.2
+--------------------
+
+* "git diff --binary | git apply" pipeline did not work well when
+ a binary blob is changed to a symbolic link.
+
+* Some combinations of -b/-w/--ignore-space-at-eol to "git diff" did
+ not work as expected.
+
+* "git grep" did not pass the -I (ignore binary) option when
+ calling out an external grep program.
+
+* "git log" and friends include HEAD to the set of starting points
+ when --all is given. This makes a difference when you are not
+ on any branch.
+
+* "git mv" to move an untracked file to overwrite a tracked
+ contents misbehaved.
+
+* "git merge -s octopus" with many potential merge bases did not
+ work correctly.
+
+* RPM binary package installed the html manpages in a wrong place.
+
+Also includes minor documentation fixes and updates.
+
+
+--
+git shortlog --no-merges v1.6.1.2-33-gc789350..
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3697edc..550a0ae 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.1.2.GIT
+DEF_VER=v1.6.1.3.GIT
LF='
'
diff --git a/RelNotes b/RelNotes
index da6e813..0a61bcd 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.6.1.2.txt \ No newline at end of file
+Documentation/RelNotes-1.6.1.3.txt \ No newline at end of file