git, branch v1.4.4-rc2

GIT 1.4.4-rc2

2006-11-12T02:30:31Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2006-11-12T02:30:31Z

* maint: git-cvsserver: read from git with -z to get non-ASCII pathnames.

git-cvsserver: read from git with -z to get non-ASCII pathnames.

2006-11-12T02:26:57Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2006-11-11T22:49:25Z

* maint: path-list: fix path-list-insert return value

path-list: fix path-list-insert return value

2006-11-11T22:46:11Z

When path-list-insert is called on an existing path, it returned an unrelated element in the list. Luckily most of the callers are ignoring the return value, but merge-recursive uses it at three places and this would have resulted in a bogus rename detection. Signed-off-by: Junio C Hamano

git-annotate: fix -S on graft file with comments.

2006-11-10T21:44:39Z

The graft file can contain comment lines and read_graft_line can return NULL for such an input, which should be skipped by the reader. Signed-off-by: Junio C Hamano

git-annotate: no need to exec blame; it is built-in now.

2006-11-10T21:36:44Z

Merge branch 'maint'

2006-11-09T23:08:19Z

* maint: git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. git-svn: fix dcommit losing changes when out-of-date from svn git-svn: don't die on rebuild when --upgrade is specified git-svn: avoid printing filenames of files we're not tracking

git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.

2006-11-09T22:41:16Z

This reduces the number of conflicts when rebasing after a series of patches to the same piece of code is committed upstream. Signed-off-by: Robert Shearman Signed-off-by: Junio C Hamano

Documentation: move blame examples

2006-11-09T18:44:56Z

This moves the example to specify a line range with regexps to a later part of the manual page that has similar examples. Signed-off-by: Junio C Hamano