Merge branch 'jh/push-default-upstream-configname' into maint

* jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream'
2011-03-16 16:47:26 -07:00
parent 7633a5ab9a 53c403116a
commit 61a6f1faec
4 changed files with 12 additions and 9 deletions
--- a/cache.h
+++ b/cache.h
@ -607,7 +607,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
 };