diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 22:02:57 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 22:02:57 +0100 |
commit | 60b188a9844cdcf865174c685a38acc053a9d43b (patch) | |
tree | b2ad8b5b4b20785ea137fa0ec5a11cb0b8517d8c /environment.c | |
parent | Merge branch 'db/checkout' (diff) | |
parent | doc: documentation update for the branch track changes (diff) | |
download | git-60b188a9844cdcf865174c685a38acc053a9d43b.tar.xz git-60b188a9844cdcf865174c685a38acc053a9d43b.zip |
Merge branch 'js/branch-track'
* js/branch-track:
doc: documentation update for the branch track changes
branch: optionally setup branch.*.merge from upstream local branches
Conflicts:
Documentation/config.txt
Documentation/git-branch.txt
Documentation/git-checkout.txt
builtin-branch.c
cache.h
t/t7201-co.sh
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 3527f1663f..6739a3f417 100644 --- a/environment.c +++ b/environment.c @@ -37,6 +37,7 @@ const char *excludes_file; 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; /* This is set by setup_git_dir_gently() and/or git_default_config() */ char *git_work_tree_cfg; |