| commit | cad0c6928eae87dc8619b035e4eced5f2c662a12 | |
| author | Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com> | |
| Wed, 6 Sep 2017 06:48:06 +0000 (6 08:48 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Sep 2017 00:51:29 +0000 (7 09:51 +0900) | ||
| tree | 857a639ccd6034730d90db48c410a0fe57751262 | treesnapshot (tar.gz zip) |
| parent | 3ec7d702a89c647ddf42a59bc3539361367de9d5 | commitdiff |
pull: fix cli and config option parsing order
pull parses first the cli options and then the config option.
The expected behavior is the other way around, so that config
options can not override the cli ones.
This patch changes the parsing order so config options are
parsed first.
Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
pull parses first the cli options and then the config option.
The expected behavior is the other way around, so that config
options can not override the cli ones.
This patch changes the parsing order so config options are
parsed first.
Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/pull.c | diffblobblamehistory |