diff options
| author | Dustin Sallings <dustin@spy.net> | 2008-05-10 15:36:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-11 09:28:52 -0700 |
| commit | c998ae9baa1cc5f507646da9850731de634d2ee7 (patch) | |
| tree | 0df6f1a71d2a6e5de4737c4ea784d67cdd760340 /environment.c | |
| parent | d1a8d0ea5fb2d4d43d0ea8f2fe45ec1fce7ec4bc (diff) | |
| download | git-c998ae9baa1cc5f507646da9850731de634d2ee7.tar.gz git-c998ae9baa1cc5f507646da9850731de634d2ee7.tar.xz | |
Allow tracking branches to set up rebase by default.
Change cd67e4d4 introduced a new configuration parameter that told
pull to automatically perform a rebase instead of a merge. This
change provides a configuration option to enable this feature
automatically when creating a new branch.
If the variable branch.autosetuprebase applies for a branch that's
being created, that branch will have branch.<name>.rebase set to true.
Signed-off-by: Dustin Sallings <dustin@spy.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index fcd1ee5ef..4892a302b 100644 --- a/environment.c +++ b/environment.c @@ -38,6 +38,7 @@ int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */ enum safe_crlf safe_crlf = SAFE_CRLF_WARN; unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; enum branch_track git_branch_track = BRANCH_TRACK_REMOTE; +enum rebase_setup_type autorebase = AUTOREBASE_NEVER; /* This is set by setup_git_dir_gently() and/or git_default_config() */ char *git_work_tree_cfg; |