diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-31 14:13:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-31 14:13:38 -0700 |
| commit | afc05f9f13beded8caf15d8e58d06fd64e0f7808 (patch) | |
| tree | b9a7b1386a97ca10b99671e4fad3a24f8b5734fc | |
| parent | 9c51414f8efb73525a6c69917f1499dab081679d (diff) | |
| parent | 3f2a7ae2c84c921e11041a5edc2522964fc1cce5 (diff) | |
| download | git-afc05f9f13beded8caf15d8e58d06fd64e0f7808.tar.gz git-afc05f9f13beded8caf15d8e58d06fd64e0f7808.tar.xz | |
Merge branch 'maint' to catch up with 1.5.3.5
| -rw-r--r-- | Documentation/RelNotes-1.5.3.5.txt | 6 | ||||
| -rw-r--r-- | Documentation/git.txt | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt index bf6a279ed..4e46d2c2a 100644 --- a/Documentation/RelNotes-1.5.3.5.txt +++ b/Documentation/RelNotes-1.5.3.5.txt @@ -92,9 +92,3 @@ Fixes since v1.5.3.4 * "git-rebase -interactive" did not handle its "--strategy" option properly. - --- -exec >/var/tmp/1 -O=v1.5.3.4-65-gf91333d -echo O=`git describe refs/heads/maint` -git shortlog --no-merges $O..refs/heads/maint diff --git a/Documentation/git.txt b/Documentation/git.txt index c4d87ac20..6db7ae1ea 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -46,6 +46,7 @@ Documentation for older releases are available here: * link:v1.5.3/git.html[documentation for release 1.5.3] * release notes for + link:RelNotes-1.5.3.5.txt[1.5.3.5], link:RelNotes-1.5.3.4.txt[1.5.3.4], link:RelNotes-1.5.3.3.txt[1.5.3.3], link:RelNotes-1.5.3.2.txt[1.5.3.2], |