diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-12-05 11:08:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-05 11:08:35 -0800 |
| commit | aa031314bf8189a15290d5bd0d85fa2a0307ceb7 (patch) | |
| tree | 18ce5d8e11ba76ef604cfc34346bc25a229be75e | |
| parent | Fix diff -B/--dirstat miscounting of newly added contents (diff) | |
| download | tgif-aa031314bf8189a15290d5bd0d85fa2a0307ceb7.tar.xz | |
Git 1.6.5.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes-1.6.5.5.txt | 9 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| l--------- | RelNotes | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/Documentation/RelNotes-1.6.5.5.txt b/Documentation/RelNotes-1.6.5.5.txt index 616e0dd0fd..ecfc57d875 100644 --- a/Documentation/RelNotes-1.6.5.5.txt +++ b/Documentation/RelNotes-1.6.5.5.txt @@ -18,6 +18,9 @@ Fixes since v1.6.5.4 twice, and held onto memory after it has used the data in it unnecessarily before it freed. + * "git diff -B" and "git diff --dirstat" was not counting newly added + contents correctly. + * "git format-patch revisions... -- path" issued an incorrect error message that suggested to use "--" on the command line when path does not exist in the current work tree (it is a separate matter if @@ -39,6 +42,8 @@ Fixes since v1.6.5.4 * "git rebase" got confused when the log message began with certain strings that looked like Subject:, Date: or From: header. -Other minor documentation updates are included. + * "git reset" accidentally run in .git/ directory checked out the + work tree contents in there. -v1.6.5.4-47-gdda8f4b + +Other minor documentation updates are included. diff --git a/Documentation/git.txt b/Documentation/git.txt index 7aa2edee58..8e93d35e44 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -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.4/git.html[documentation for release 1.6.5.4] +* link:v1.6.5.5/git.html[documentation for release 1.6.5.5] * release notes for + 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], link:RelNotes-1.6.5.2.txt[1.6.5.2], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 6b4f708c0d..0c9be2080b 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.5.4 +DEF_VER=v1.6.5.5 LF=' ' @@ -1 +1 @@ -Documentation/RelNotes-1.6.5.4.txt
\ No newline at end of file +Documentation/RelNotes-1.6.5.5.txt
\ No newline at end of file |