Browse Source

Git 1.6.5.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint v1.6.5.6
Junio C Hamano 15 years ago
parent
commit
9861b644e0
  1. 23
      Documentation/RelNotes-1.6.5.6.txt
  2. 3
      Documentation/git.txt
  3. 2
      GIT-VERSION-GEN
  4. 2
      RelNotes

23
Documentation/RelNotes-1.6.5.6.txt

@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
Git v1.6.5.6 Release Notes
==========================

Fixes since v1.6.5.5
--------------------

* "git add -p" had a regression since v1.6.5.3 that broke deletion of
non-empty files.

* "git archive -o o.zip -- Makefile" produced an archive in o.zip
but in POSIX tar format.

* Error message given to "git pull --rebase" when the user didn't give
enough clue as to what branch to integrate with still talked about
"merging with" the branch.

* Error messages given by "git merge" when the merge resulted in a
fast-forward still were in plumbing lingo, even though in v1.6.5
we reworded messages in other cases.

* The post-upload-hook run by upload-pack in response to "git fetch" has
been removed, due to security concerns (the hook first appeared in
1.6.5).

3
Documentation/git.txt

@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' @@ -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.6.5.5/git.html[documentation for release 1.6.5.5]
* link:v1.6.5.6/git.html[documentation for release 1.6.5.6]

* release notes for
link:RelNotes-1.6.5.6.txt[1.6.5.6],
link:RelNotes-1.6.5.5.txt[1.6.5.5],
link:RelNotes-1.6.5.4.txt[1.6.5.4],
link:RelNotes-1.6.5.3.txt[1.6.5.3],

2
GIT-VERSION-GEN

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v1.6.5.5
DEF_VER=v1.6.5.6

LF='
'

2
RelNotes

@ -1 +1 @@ @@ -1 +1 @@
Documentation/RelNotes-1.6.5.5.txt
Documentation/RelNotes-1.6.5.6.txt
Loading…
Cancel
Save