Skip to content

Commit

Permalink
Git 1.6.5.6
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Dec 10, 2009
1 parent 782a000 commit 9861b64
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 3 deletions.
23 changes: 23 additions & 0 deletions Documentation/RelNotes-1.6.5.6.txt
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

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

LF='
'
Expand Down
2 changes: 1 addition & 1 deletion RelNotes

0 comments on commit 9861b64

Please sign in to comment.