| commit | 6b5a795bf586aa019bbb11ffe9f2fc315ba9765e | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 28 Dec 2006 07:35:11 +0000 (28 02:35 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 28 Dec 2006 09:08:06 +0000 (28 01:08 -0800) | ||
| tree | 9a2ce7462d6cbade246358a6695d8e4f116121fd | treesnapshot (tar.gz zip) |
| parent | de811948baa689382ad191c1c95e8be51a92c4fe | commitdiff |
Allow git-merge to select the default strategy.
Now that git-merge knows how to use the pull.{twohead,octopus}
configuration options to select the default merge strategy there
is no reason for git-pull to do the same immediately prior to
invoking git-merge.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Now that git-merge knows how to use the pull.{twohead,octopus}
configuration options to select the default merge strategy there
is no reason for git-pull to do the same immediately prior to
invoking git-merge.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-pull.sh | diffblobblamehistory |