Differences

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

--- git-tutorial [2012/12/16 22:14] – smilauer
+++ git-tutorial [2014/01/23 18:46] – nitramkaroh
@@ Line 85: / Line 85: @@
 ==== Viewing the Commit History ====
-You can show the history of commits in the current branch using gil log command
+You can show the history of commits in the current branch using git log command
     git log
@@ Line 118: / Line 118: @@
-====== Contributing to OOFEM - Practical Workflow ======
+====== Contributing to OOFEM - Practical workflow ======
 Contributing to oofem project is different. Typically, you don’t have the permissions to directly update branches on the project reference repository and you have to pass your contribution(s) to the maintainers in some way. In OOFEM, these people ('lieutenants') are in charge of a specific subsystem of the project and they merge in all changes related to that subsystem and push them to the reference (blessed) repository that everyone can clone from again. In general, lieutenants prefer to accept contributed patches via e-mail.
@@ Line 126: / Line 126: @@
 Clone reference repository from remote server. This creates only ''master'' branch in you local machine. 'oofem.git' is an arbitrary name of directory.
   $ git clone http://www.oofem.org/git/oofem.git oofem.git
   $ cd oofem.git
 Note: when a repository is cloned, git automatically creates a master branch that tracks origin/master branch, but there is no automatic update (need to use "pull" command)
+If you already have oofem.git directory from a previous time, you can update ''master'' branch.
+   $ (git diff --name-only master origin/master   or   $git diff master origin/master)  //see the differences between local and remote masters
+   $ git checkout master
+   $ git pull --rebase
 Normally, we do not want to modify ''master'' branch directly. For this reason, we create a new brach ''featureA'' for our development, which is a copy from an active previous branch ''master''