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/git.txt | |
| parent | 791970425431878c8abe71645a03f0f64e20e461 (diff) | |
| parent | 15b7898c5e9fc6fed9a6064213cfcd08cf7d7314 (diff) | |
| download | git-7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b.tar.gz git-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/git.txt')
| -rw-r--r-- | Documentation/git.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 5e80cfd71..4a29f47b4 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], |