Changes between Version 1 and Version 2 of SourceCodeGit/Commands

Timestamp:

Aug 17, 2017, 6:49:45 AM (7 years ago)

Author:

Christian Beer

Comment:

--

SourceCodeGit/Commands

@@ -3 +3 @@
 Writing this page I lean heavily on the commands used at [https://www.siteground.com/tutorials/git/commands.htm Siteground.com] and some on [https://confluence.atlassian.com/bitbucket/branching-a-repository-223217999.html Confluence].
 
-We're not trying to teach a user how to use Git, but instead if they're ever stuck they can come to the page and quickly look down the page for the command they're missing. 
+We're not trying to teach a user how to use Git, but instead if they're ever stuck they can come to the page and quickly look down the page for the command they're missing.
+
+'''Note:''' Git is context sensitive. All commands by default operate on the current active branch if no specific branch is specified! Before copy&pasting a command please make sure you have the correct branch activated.
 
 ----
@@ -9 +11 @@
 git clone https://github.com/BOINC/boinc boinc
 }}}
-With this command you make a complete copy of the remote BOINC repository from the server onto your computer.
+With this command you make a complete copy of the remote BOINC repository from the server onto your computer into the newly created directory "boinc".
 
 {{{
 git fetch
 }}}
-With this command you get all the objects from the remote repository that are not present in the local one.
+With this command you get all the objects (commits, branches) from the remote repository that are not present in the local one but nothing get's merged.
 
 {{{
 git pull
 }}}
-With this command you get all the changed files from the remote repository and merge them with your local one.
+With this command you get all the objects from the remote repository (''git fetch'') and merge changes from the remote branch into your currently active local branch (''git merge'').
 
 {{{
-git branch boinc_7.8
+git checkout client_release/7/7.8
 }}}
-With this command you make a branch called boinc_7.8 in your local repository. 
+With this command you create and activate a local copy of the remote client release branch. 
 
 {{{
-git branch --set-upstream-to=origin/client_release/7/7.8
+git checkout --track -b boinc_7.8 origin/client_release/7/7.8
 }}}
-It may happen at times that you've cloned the BOINC repository and that it then only remembers the path to the remote repository's Master branch, which makes it impossible for you to update the boinc_7.8 branch with. With the above command you can quickly set the boinc_7.8 branch to the right remote repository. Git on your system will remember both paths after this. 
+With this command you create and activate a local copy of the remote client release branch with a custom name. The local branch is also connected to the remote branch so that ''git pull'' still works. 
 
 {{{
 git checkout boinc_7.8
 }}}
-With this command you can switch to the boinc_7.8 branch from the Master branch.
+With this command you can switch to your custom branch if you switched to a different branch in the meantime.
 
 {{{
 git checkout master
 }}}
-With this command you can switch to the Master branch from the boinc_7.8 branch. 
+With this command you can switch to the Master branch if you switched to a different branch in the meantime.
 
 {{{