diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-28 07:35:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 09:07:51 (GMT) |
| commit | de811948baa689382ad191c1c95e8be51a92c4fe (patch) | |
| tree | 709c669fc54479544e58119be5769657fff5a3b8 /t | |
| parent | bf699582fd7be26f7809858941fa831380e5bce7 (diff) | |
| download | git-de811948baa689382ad191c1c95e8be51a92c4fe.zip git-de811948baa689382ad191c1c95e8be51a92c4fe.tar.gz git-de811948baa689382ad191c1c95e8be51a92c4fe.tar.bz2 | |
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>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions