From b59122f86f23007fce374f92de7f6e0a73793026 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 7 Feb 2009 00:51:47 -0800 Subject: [PATCH] GIT 1.6.1.3 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.1.3.txt | 32 ++++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.6.1.3.txt diff --git a/Documentation/RelNotes-1.6.1.3.txt b/Documentation/RelNotes-1.6.1.3.txt new file mode 100644 index 0000000000..6f0bde156a --- /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 3697edc72e..550a0ae371 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 da6e81321a..0a61bcd11b 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 -- 2.11.4.GIT