user/sven/git.git, branch v1.4.3.5

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

2006-11-12T02:26:57Z

Signed-off-by: Junio C Hamano

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-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

git-svn: fix dcommit losing changes when out-of-date from svn

2006-11-09T17:34:46Z

There was a bug in dcommit (and commit-diff) which caused deltas to be generated against the latest version of the changed file in a repository, and not the revision we are diffing (the tree) against locally. This bug can cause recent changes to the svn repository to be silently clobbered by git-svn if our repository is out-of-date. Thanks to Steven Grimm for noticing the bug. The (few) people using the commit-diff command are now required to use the -r/--revision argument. dcommit usage is unchanged. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

git-svn: don't die on rebuild when --upgrade is specified

2006-11-09T17:34:36Z

--copy-remote and --upgrade are rarely (never?) used together, so if --copy-remote is specified, that means the user really wanted to copy the remote ref, and we should fail if that fails. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

git-svn: avoid printing filenames of files we're not tracking

2006-11-09T17:34:27Z

This is purely an aesthetic change, we already skip importing of files that don't affect the subdirectory we import. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

Nicer error messages in case saving an object to db goes wrong

2006-11-09T17:33:53Z

Currently the error e.g. when pushing to a read-only repository is quite confusing, this attempts to clean it up, unifies error reporting between various object writers and uses error() on couple more places. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

remove an unneeded test

2006-11-07T23:50:06Z

In wt-status.c there is a test which does nothing. This patch removes it. Signed-off-by: Tero Roponen Signed-off-by: Junio C Hamano

Documentation: Transplanting branch with git-rebase --onto

2006-11-06T23:01:14Z

Added example of transplantig feature branch from one development branch (for example "next") into the other development branch (for example "master"). [jc: talking Carl's advice this contains both examples sent to the list by Jakub in his original message.] Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

merge-recursive implicitely depends on trust_executable_bit

2006-11-06T16:42:02Z

Read the configuration in to get core.filemode value for this particular repository. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano