Skip to content

Commit

Permalink
GIT v1.5.2-rc3
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed May 10, 2007
1 parent 56822cc commit 843142a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 8 additions & 1 deletion Documentation/RelNotes-1.5.2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -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='
'
Expand Down

0 comments on commit 843142a

Please sign in to comment.