aboutsummaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-06-18 02:17:54 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-18 12:20:36 -0700
commited342fdea0b7fd466ed3257c5e68aa81c391b782 (patch)
tree52da9af7703434bc8cb40c74e7e52e3afa4ef38c /ll-merge.c
parent90dce51584e908232ff279a6c2949ea9855dddf3 (diff)
downloadgit-ed342fdea0b7fd466ed3257c5e68aa81c391b782.tar.gz
git-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 'll-merge.c')
0 files changed, 0 insertions, 0 deletions