![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Mark Hollomon <markhollomon@comcast.net> | |
| Wed, 15 Mar 2006 22:51:41 +0000 (22:51 +0000) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 16 Mar 2006 00:14:33 +0000 (16:14 -0800) | ||
| commit | c8e2db00f9622af6e5f640443dfbe63bb1af39e0 | |
| tree | 7c32c149066695f8cfa08abaa7a7a31f5118b0ac | tree | snapshot |
| parent | c982647310fc5acd0bd6ebc408e70470447b387f | commit | diff |
Let merge set the default strategy.
If the user does not set a merge strategy for git-pull,
let git-merge calculate a default strategy.
[jc: with minor stylistic tweaks]
Signed-off-by: Mark Hollomon <markhollomon@comcast.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
If the user does not set a merge strategy for git-pull,
let git-merge calculate a default strategy.
[jc: with minor stylistic tweaks]
Signed-off-by: Mark Hollomon <markhollomon@comcast.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-pull.sh | diff | blob | history |