git/git-merge-recursive.py, branch v0.99.8a

[PATCH] Teach the recursive merge strategy about renames.

2005-10-02T17:03:00Z

It will now merge cases where a file was renamed in one branch and modified in the other branch cleanly. We also detect a couple of conflict cases now that wasn't detected before. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.

2005-09-25T23:08:53Z

If the working tree is dirty read-tree will fail, and we don't want an ugly stack trace in that case. Also make sure we don't print stack traces when we use 'die'. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

git-merge-recursive: Trivial RE fixes.

2005-09-14T04:09:03Z

Signed-off-by: Junio C Hamano

[PATCH] Use a temporary index file when we merge the common ancestors.

2005-09-13T22:45:25Z

With this change we can get rid of a call to 'git-update-index --refresh'. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

[PATCH] Adjust git-merge-recursive.py for the new tool names.

2005-09-13T22:45:25Z

Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

[PATCH] Don't output 'Automatic merge failed, ...'

2005-09-13T22:45:24Z

git-merge.sh does this for us. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

[PATCH] Be more like the 'resolve' strategy.

2005-09-13T22:45:23Z

If there are non-mergeable changes leave the head contents in the cache and update the working directory with the output from merge(1). In the add/add and delete/modify conflict cases leave unmerged cache entries in the index. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano

[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.

2005-09-13T07:20:54Z

Otherwise we would regret when Fredrik comes up with another merge algorithm with different pros-and-cons with the current one. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano