diff options
| author | Jay Soffian <jaysoffian@gmail.com> | 2008-02-19 11:24:37 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-19 21:17:45 -0800 |
| commit | 9ed36cfa35cfbd09c454f12194a91cd50ba284d1 (patch) | |
| tree | db9d61a4a4e47cf8fe6f442f1c46f1d6cce09ae4 /environment.c | |
| parent | 569012bf91ddb25220483e8912e079ce8a501525 (diff) | |
| download | git-9ed36cfa35cfbd09c454f12194a91cd50ba284d1.tar.gz | |
branch: optionally setup branch.*.merge from upstream local branches
"git branch" and "git checkout -b" now honor --track option even when
the upstream branch is local. Previously --track was silently ignored
when forking from a local branch. Also the command did not error out
when --track was explicitly asked for but the forked point specified
was not an existing branch (i.e. when there is no way to set up the
tracking configuration), but now it correctly does.
The configuration setting branch.autosetupmerge can now be set to
"always", which is equivalent to using --track from the command line.
Setting branch.autosetupmerge to "true" will retain the former behavior
of only setting up branch.*.merge for remote upstream branches.
Includes test cases for the new functionality.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
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 18a1c4eec4..1f74b4b557 100644 --- a/environment.c +++ b/environment.c @@ -36,6 +36,7 @@ char *editor_program; char *excludes_file; int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */ 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; |