Jeff King <peff@xxxxxxxx> writes: > ... I don't think it would be > too big a problem for format-patch to learn some options to configure > its diffs. We already have some options in format.* for various things. I am not sure; diff.context is rather special in that the variable behind it belongs to the diff layer and is set via diff_config that is called by diff_ui_config that in turn is called by log_config which is called by format_config. If we want to say "format.context" trumps "diff.config", then a new internal variable to receive the value of the variable must be invented and after the config gets read, cmd_format_patch() needs to do something silly like this: git_config(git_format_config, NULL); + if (format_context != -1) + diff_default_context = format_context; repo_init_revisions(the_repository, &rev, prefix); committing layering violation by exposing diff_default_context variable.