diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:44:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:44:56 -0800 |
| commit | 7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b (patch) | |
| tree | 6cd9d67bad0f51acbe6baef3fea257f8b0cbc01a /Documentation | |
| parent | am: don't persist keepcr flag (diff) | |
| parent | Git 1.7.6.5 (diff) | |
| download | tgif-7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b.tar.xz | |
Merge branch 'maint-1.7.6' into maint-1.7.7
* maint-1.7.6:
Git 1.7.6.5
blame: don't overflow time buffer
fetch: create status table using strbuf
Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.6.5.txt | 26 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.6.5.txt b/Documentation/RelNotes/1.7.6.5.txt new file mode 100644 index 0000000000..6713132a9e --- /dev/null +++ b/Documentation/RelNotes/1.7.6.5.txt @@ -0,0 +1,26 @@ +Git v1.7.6.5 Release Notes +========================== + +Fixes since v1.7.6.4 +-------------------- + + * The date parser did not accept timezone designators that lack minutes + part and also has a colon between "hh:mm". + + * After fetching from a remote that has very long refname, the reporting + output could have corrupted by overrunning a static buffer. + + * "git mergetool" did not use its arguments as pathspec, but as a path to + the file that may not even have any conflict. + + * "git name-rev --all" tried to name all _objects_, naturally failing to + describe many blobs and trees, instead of showing only commits as + advertised in its documentation. + + * "git remote rename $a $b" were not careful to match the remote name + against $a (i.e. source side of the remote nickname). + + * "gitweb" used to produce a non-working link while showing the contents + of a blob, when JavaScript actions are enabled. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index 5e80cfd71a..4a29f47b41 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -50,9 +50,10 @@ Documentation for older releases are available here: link:RelNotes/1.7.7.1.txt[1.7.7.1], link:RelNotes/1.7.7.txt[1.7.7]. -* link:v1.7.6.4/git.html[documentation for release 1.7.6.4] +* link:v1.7.6.5/git.html[documentation for release 1.7.6.5] * release notes for + link:RelNotes/1.7.6.5.txt[1.7.6.5], link:RelNotes/1.7.6.4.txt[1.7.6.4], link:RelNotes/1.7.6.3.txt[1.7.6.3], link:RelNotes/1.7.6.2.txt[1.7.6.2], |