git, branch v1.5.1-rc2

GIT 1.5.1-rc2

2007-03-26T01:01:50Z

Signed-off-by: Junio C Hamano

git-svn: fix rel_path() when not connected to the repository root

2007-03-26T01:01:28Z

This should fix fetching for people who did not use "git svn --minimize" or cannot connect to the repository root due to the lack of permissions. I'm not sure what I was on when I made the change to the rel_path() function in 4e9f6cc78e5d955bd0faffe76ae9aea6590189f1 that made it die() when we weren't connected to the repository root :x Thanks to Sven Verdoolaege for reporting this bug. Signed-off-by: Junio C Hamano

use xmalloc in git.c and help.c

2007-03-26T01:00:23Z

Signed-off-by: James Bowes Signed-off-by: Junio C Hamano

Merge branch 'jc/fpl'

2007-03-26T00:47:07Z

* jc/fpl: git-log --first-parent: show only the first parent log

Update README to point at a few key periodical messages to the list

2007-03-26T00:42:32Z

They give a good starting point to new people who want to get involved. This owes suggestions by Martin Langhoff and Steven Grimm. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-03-25T22:08:11Z

* maint: user-manual: introduce "branch" and "branch head" differently glossary: clean up cross-references glossary: stop generating automatically user-manual: Use def_ instead of ref_ for glossary references. user-manual.txt: fix a tiny typo. user-manual: run xsltproc without --nonet option

Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

2007-03-25T22:07:27Z

* 'maint' of git://linux-nfs.org/~bfields/git: user-manual: introduce "branch" and "branch head" differently glossary: clean up cross-references glossary: stop generating automatically user-manual: Use def_ instead of ref_ for glossary references. user-manual.txt: fix a tiny typo. user-manual: run xsltproc without --nonet option

Merge branch 'js/remote-show-push'

2007-03-25T08:45:06Z

* js/remote-show-push: Teach git-remote to list pushed branches.

Merge branch 'maint'

2007-03-25T07:21:40Z

* maint: gitweb: Add some installation notes in gitweb/INSTALL gitweb: Fix not marking signoff lines in "log" view gitweb: Don't escape attributes in CGI.pm HTML methods gitweb: Change to use explicitly function call cgi->escapHTML()

Use diff* with --exit-code in git-am, git-rebase and git-merge-ours

2007-03-25T06:01:36Z

This simplifies the shell code, reduces its memory footprint, and speeds things up. The performance improvements should be noticable when git-rebase works on big commits. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano