diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-01-31 10:37:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-31 10:37:44 -0800 |
| commit | 09e0be130d83ceedb3653d9a41768c6a13457ac5 (patch) | |
| tree | 466600cb071233316506ff31a3e9966679fb2908 /config.c | |
| parent | The first batch to start the current cycle (diff) | |
| parent | branch,checkout: fix --track documentation (diff) | |
| download | tgif-09e0be130d83ceedb3653d9a41768c6a13457ac5.tar.xz | |
Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules
* js/branch-track-inherit:
branch,checkout: fix --track documentation
branch,checkout: fix --track usage strings
config: require lowercase for branch.*.autosetupmerge
branch: add flags and config to inherit tracking
branch: accept multiple upstream branches for tracking
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1559,9 +1559,12 @@ static int git_default_i18n_config(const char *var, const char *value) static int git_default_branch_config(const char *var, const char *value) { if (!strcmp(var, "branch.autosetupmerge")) { - if (value && !strcasecmp(value, "always")) { + if (value && !strcmp(value, "always")) { git_branch_track = BRANCH_TRACK_ALWAYS; return 0; + } else if (value && !strcmp(value, "inherit")) { + git_branch_track = BRANCH_TRACK_INHERIT; + return 0; } git_branch_track = git_config_bool(var, value); return 0; |