projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ccfd3e9) | patch
[PATCH] Be more like the 'resolve' strategy.
authorFredrik Kuivinen <freku045@student.liu.se>
Tue, 13 Sep 2005 21:39:34 +0000 (23:39 +0200)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 22:45:23 +0000 (15:45 -0700)
commitd9a23fa6f7124befe7803f5f3a8c53999578caa4
tree6c8855b99470b0d36c409d89772d1c0f55878191tree | snapshot
parentccfd3e99621f489db4ea37a03be7674adbd03f6ecommit | diff
[PATCH] Be more like the 'resolve' strategy.

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 <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py diff | blob | history
The core git plumbing