Merge branch 'il/branch-set-upstream'

* il/branch-set-upstream: branch: warn and refuse to set a branch as a tracking branch of itself. Add branch --set-upstream
2010-01-22 16:08:05 -08:00
parent 67bc740721 85e2233f98
commit 1a545d0b5f
5 changed files with 64 additions and 13 deletions
--- a/cache.h
+++ b/cache.h
@ -553,6 +553,7 @@ enum branch_track {
 	BRANCH_TRACK_REMOTE,
 	BRANCH_TRACK_ALWAYS,
 	BRANCH_TRACK_EXPLICIT,
+	BRANCH_TRACK_OVERRIDE,
 };

 enum rebase_setup_type {