aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2011-02-16 01:54:24 +0100
committerJunio C Hamano <gitster@pobox.com>2011-02-16 10:21:52 -0800
commit53c403116a947c538132fc721f83196036f7a299 (patch)
treee2c89a7ebdc7f121676c49475f78da442bc0dc1b /cache.h
parent7ed863a85a6ce2c4ac4476848310b8f917ab41f9 (diff)
downloadgit-53c403116a947c538132fc721f83196036f7a299.tar.gz
git-53c403116a947c538132fc721f83196036f7a299.tar.xz
push.default: Rename 'tracking' to 'upstream'
Users are sometimes confused with two different types of "tracking" behavior in Git: "remote-tracking" branches (e.g. refs/remotes/*/*) versus the merge/rebase relationship between a local branch and its @{upstream} (controlled by branch.foo.remote and branch.foo.merge config settings). When the push.default is set to 'tracking', it specifies that a branch should be pushed to its @{upstream} branch. In other words, setting push.default to 'tracking' applies only to the latter of the above two types of "tracking" behavior. In order to make this more understandable to the user, we rename the push.default == 'tracking' option to push.default == 'upstream'. push.default == 'tracking' is left as a deprecated synonym for 'upstream'. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index d83d68c85..7acf12012 100644
--- a/cache.h
+++ b/cache.h
@@ -608,7 +608,7 @@ enum rebase_setup_type {
enum push_default_type {
PUSH_DEFAULT_NOTHING = 0,
PUSH_DEFAULT_MATCHING,
- PUSH_DEFAULT_TRACKING,
+ PUSH_DEFAULT_UPSTREAM,
PUSH_DEFAULT_CURRENT
};