diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-10 14:49:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-10 15:22:02 -0700 |
| commit | 843142ada000a992fa87bd2dc7796501332a52d9 (patch) | |
| tree | dcea0ab3229f1a6e84efb952d5143d85fc89817e | |
| parent | Document 'git-log --decorate' (diff) | |
| download | tgif-843142ada000a992fa87bd2dc7796501332a52d9.tar.xz | |
GIT v1.5.2-rc3
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/RelNotes-1.5.2.txt | 9 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.2.txt b/Documentation/RelNotes-1.5.2.txt index c14f3da7aa..42e7fa5bec 100644 --- a/Documentation/RelNotes-1.5.2.txt +++ b/Documentation/RelNotes-1.5.2.txt @@ -44,6 +44,11 @@ Updates since v1.5.1 * Comes with an updated git-gui 0.7.0 +* Updated gitweb: + + - can show combined diff for merges; + - uses font size of user's preference, not hardcoded in pixels; + * New commands and options. - "git bisect start" can optionally take a single bad commit and @@ -141,6 +146,8 @@ Updates since v1.5.1 - Optimized "git-add $path" in a large directory, most of whose contents are ignored. + - Optimized "git-diff-tree" for reduced memory footprint. + - The recursive merge strategy updated a worktree file that was changed identically in two branches, when one of them renamed it. We do not do that when there is no rename, so @@ -187,6 +194,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.2-rc2-45-g618e613 +O=v1.5.2-rc2-91-g616e40b echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index f6adb91ed2..bd4a0443c4 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.2-rc2.GIT +DEF_VER=v1.5.2-rc3.GIT LF=' ' |