diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:46:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:46:32 -0800 |
| commit | 4d1826d1d96a4284ef268c6febeaa9fabfa75e9e (patch) | |
| tree | c19c924f1072120694cf8bb9283f1334e619d94d /builtin/remote.c | |
| parent | aa13132d9068d77af0b1d8e2cfbf93cda4f09226 (diff) | |
| parent | 0a54f709057729d0aa9f1e767e4f201834f14834 (diff) | |
| download | git-4d1826d1d96a4284ef268c6febeaa9fabfa75e9e.tar.gz git-4d1826d1d96a4284ef268c6febeaa9fabfa75e9e.tar.xz | |
Merge branch 'fc/trivial'
* fc/trivial:
remote: fix status with branch...rebase=preserve
fetch: add missing documentation
t: trivial whitespace cleanups
abspath: trivial style fix
Diffstat (limited to 'builtin/remote.c')
| -rw-r--r-- | builtin/remote.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index f532f3545..119e9151a 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -307,8 +307,13 @@ static int config_read_branches(const char *key, const char *value, void *cb) space = strchr(value, ' '); } string_list_append(&info->merge, xstrdup(value)); - } else - info->rebase = git_config_bool(orig_key, value); + } else { + int v = git_config_maybe_bool(orig_key, value); + if (v >= 0) + info->rebase = v; + else if (!strcmp(value, "preserve")) + info->rebase = 1; + } } return 0; } |