mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/checkout-guess'

Browse Source 
"git checkout" learned to use checkout.guess configuration variable
and enable/disable its "--[no-]guess" option accordingly.

* dl/checkout-guess:
  checkout: learn to respect checkout.guess
  Documentation/config/checkout: replace sq with backticks
This commit is contained in:
Junio C Hamano
2020-10-27 15:09:51 -07:00
parent f3cfeb3078 64f1f58fe7
commit 0e41cfad62
8 changed files with 109 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/checkout.c
View File

@ -1106,11 +1106,16 @@ static int switch_branches(const struct checkout_opts *opts,
static int git_checkout_config(const char *var, const char *value, void *cb)
{
struct checkout_opts *opts = cb;
if (!strcmp(var, "diff.ignoresubmodules")) {
struct checkout_opts *opts = cb;
handle_ignore_submodules_arg(&opts->diff_options, value);
return 0;
}
if (!strcmp(var, "checkout.guess")) {
opts->dwim_new_local_branch = git_config_bool(var, value);
return 0;
}
if (starts_with(var, "submodule."))
return git_default_submodule_config(var, value, NULL);