| commit | 1719b5e446f54e4196903ae6ed5f8867a5755bf6 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Mon, 21 Jul 2008 16:10:47 +0000 (21 18:10 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Jul 2008 05:29:46 +0000 (21 22:29 -0700) | ||
| tree | 933449ee7ff043fc7e01d9dca0348eaf6a21e56c | treesnapshot (tar.gz zip) |
| parent | ac2e28c0a43ced3837fbbcf66fd693244b6c6693 | commitdiff |
builtin-merge: give a proper error message for invalid strategies in config
'git merge -s foobar' diagnosed invalid "foobar" strategy and errored out
with a message, but foobar in pull.twohead or pull.octopus was just
silently ignored. This makes invalid strategy both on the command line
and in the configuration file to trigger the same error.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
'git merge -s foobar' diagnosed invalid "foobar" strategy and errored out
with a message, but foobar in pull.twohead or pull.octopus was just
silently ignored. This makes invalid strategy both on the command line
and in the configuration file to trigger the same error.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge.c | diffblobblamehistory | |
| t/t7601-merge-pull-config.sh | diffblobblamehistory |