Differences

This shows you the differences between two versions of the page.

--- git_establishing_tracking_branches [2019/04/04 00:56] – created rpjday
+++ git_establishing_tracking_branches [2019/04/04 01:53] (current) – [Track upstream branch from existing branch] rpjday
@@ Line 3: / Line 3: @@
 Various ways to establish tracking branches. Use linux-next remote ''ln'' with branches:
-  * master
+  * ''master''
-  * akpm
+  * ''akpm''
-  * akpm-base
+  * ''akpm-base''
-  * pending-fixexs
+  * ''pending-fixes''
-  * stable
+  * ''stable''
+<code>
+$ git fetch ln
+$ git branch -a
+* master
+  remotes/ln/akpm
+  remotes/ln/akpm-base
+  remotes/ln/master
+  remotes/ln/pending-fixes
+  remotes/ln/stable
+  remotes/origin/HEAD -> origin/master
+  remotes/origin/master
+$
+</code>
+===== Track upstream branch from EXISTING branch =====
+<code>
+$ git branch [-u|--set-upstream-to=] <origin/remote> [localname]
+</code>
+Create the branch to be set to track:
+<code>
+$ git checkout -b rday
+</code>
+Examples while on branch ''rday'':
+<code>
+$ git branch -u ln/akpm
+$ git branch -u ln/akpm myakpm
+$ git branch --set-upstream-to=ln/akpm
+$ git branch --set-upstream-to=ln/akpm myakpm
+</code>
+===== Establish new tracking branch =====
+<code>
+$ git checkout ln/akpm             [detached head]
+$ git checkout --track ln/akpm
+$ git checkout -b myakpm ln/akpm
+$ git checkout -b
+</code>
+===== Seeing tracking branches =====
+<code>
+$ git branch -vv
+...
+* myakpm 1eff8dddb1af [ln/akpm] drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
+...
+</code>
+===== Unset tracking branches =====
+<code>
+$ git branch --unset-upstream
+</code>