![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 24 Aug 2005 04:08:59 +0000 (21:08 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 24 Aug 2005 04:08:59 +0000 (21:08 -0700) | ||
| commit | 9585e406224b97b24b46131005b809a6612a3eac | |
| tree | 47b47d3fae26e51f2b1d04fd9e898f5a0546da02 | tree | snapshot |
| parent | 2a29da7c6d6103c4719c71f6cce88e853260912c | commit | diff |
Try to find the optimum merge base while resolving.
The merge-base command acquires a new option, '--all', that causes it
to output all the common ancestor candidates. The "git resolve"
command then uses it to pick the optimum merge base by picking the one
that results in the smallest number of nontrivial merges.
Signed-off-by: Junio C Hamano <junkio@cox.net>
The merge-base command acquires a new option, '--all', that causes it
to output all the common ancestor candidates. The "git resolve"
command then uses it to pick the optimum merge base by picking the one
that results in the smallest number of nontrivial merges.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-resolve-script | diff | blob | history | |
| merge-base.c | diff | blob | history |