diff options
| author |  Stephen Boyd <bebarino@gmail.com> | 2009-06-18 02:17:54 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-06-18 12:20:36 -0700 |
| commit | ed342fdea0b7fd466ed3257c5e68aa81c391b782 (patch) | |
| tree | 52da9af7703434bc8cb40c74e7e52e3afa4ef38c /t/t6031-merge-recursive.sh | |
| parent | use xstrdup, not strdup in ll-merge.c (diff) | |
| download | tgif-ed342fdea0b7fd466ed3257c5e68aa81c391b782.tar.xz | |
add: allow configurations to be overriden by command line
Don't call git_config after parsing the command line options, otherwise
the config settings will override any settings made by the command line.
This can be seen by setting add.ignore_errors and then specifying
--no-ignore-errors when using git-add.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6031-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions