![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 28 Dec 2006 07:35:05 +0000 (02:35 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 28 Dec 2006 09:07:51 +0000 (01:07 -0800) | ||
| commit | de811948baa689382ad191c1c95e8be51a92c4fe | |
| tree | 709c669fc54479544e58119be5769657fff5a3b8 | tree | snapshot |
| parent | bf699582fd7be26f7809858941fa831380e5bce7 | commit | diff |
Honor pull.{twohead,octopus} in git-merge.
If git-merge is invoked without a strategy argument it is probably
being run as a porcelain-ish command directly and is not being run
from within git-pull. However we still should honor whatever merge
strategy the user may have selected in their configuration, just as
`git-pull .` would have.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
If git-merge is invoked without a strategy argument it is probably
being run as a porcelain-ish command directly and is not being run
from within git-pull. However we still should honor whatever merge
strategy the user may have selected in their configuration, just as
`git-pull .` would have.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diff | blob | history |