Browse Source

GIT 1.6.1.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint v1.6.1.3
Junio C Hamano 16 years ago
parent
commit
b59122f86f
  1. 32
      Documentation/RelNotes-1.6.1.3.txt
  2. 2
      GIT-VERSION-GEN
  3. 2
      RelNotes

32
Documentation/RelNotes-1.6.1.3.txt

@ -0,0 +1,32 @@ @@ -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..

2
GIT-VERSION-GEN

@ -1,7 +1,7 @@ @@ -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='
'

2
RelNotes

@ -1 +1 @@ @@ -1 +1 @@
Documentation/RelNotes-1.6.1.2.txt
Documentation/RelNotes-1.6.1.3.txt
Loading…
Cancel
Save