(correct errant instructions that would leave a branch with the same commit SHA as the copy it came from) |
(Additional clarification about the use of option switches in checking out branches to track remote branches.) |
||
| Line 23: | Line 23: | ||
Checkout a specific branch from origin, and track it. | Checkout a specific branch from origin, and track it. | ||
What if you enter <code>git checkout -b REL1_29</code> when you *should have entered* <code>git checkout -b REL1_29 origin/REL1_29</code>? J<s>ust tell git that you meant to track the branch in origin: <code>git branch --set-upstream-to=origin/REL1_29 REL1_29</code></s> Set upstream doesn't do what's intended here! You should delete the branch that you created as a 'copy'; and then checkout the branch correctly. | What if you enter <code>git checkout -b REL1_29</code> when you *should have entered* <code>git checkout -b REL1_29 origin/REL1_29</code>? J<s>ust tell git that you meant to track the branch in origin: <code>git branch --set-upstream-to=origin/REL1_29 REL1_29</code></s> Set upstream doesn't do what's intended here! You should delete the branch that you created as a 'copy'; and then checkout the branch correctly. To checkout the branch correctly, just IGNORE the <code>-b</code> flag altogether. If you ''do'' use the <code>-b</code> flag, then you ''must'' use the long form that references the remote branch to track. If you just do a '<code>git checkout foo</code>' and there exists the same branch upstream at <code>origin/foo</code> then git will checkout a new branch set to track the remote. | ||
== Tracing in Status == | == Tracing in Status == | ||
edits
