projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: de81194) | patch
Allow git-merge to select the default strategy.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:11 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Dec 2006 09:08:06 +0000 (01:08 -0800)
commit6b5a795bf586aa019bbb11ffe9f2fc315ba9765e
tree9a2ce7462d6cbade246358a6695d8e4f116121fdtree | snapshot
parentde811948baa689382ad191c1c95e8be51a92c4fecommit | diff
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>
git-pull.sh diff | blob | history
Git—the stupid content tracker