Differences

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

--- git-tutorial [2012/12/29 23:14] – smilauer
+++ git-tutorial [2017/10/31 17:21] – oofem git repo updated to github bp
@@ Line 40: / Line 40: @@
 If you want to get a copy of an existing Git repository — for example, a project you’d like to contribute to — the command you need is git clone.
-   $ git clone http://www.oofem.org/git/oofem.git oofem.git
+   $ git clone https://github.com/oofem/oofem.git
@@ 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 131: / Line 131: @@
 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 your branch. This does not touch your working branch.
+If you already have oofem.git directory from a previous time, you can update ''master'' branch.
-   $ git fetch origin  //update master
-   $ git checkout -b featureA //change to branch you want to change
+   $ (git diff --name-only master origin/master   or   $git diff master origin/master)  //see the differences between local and remote masters
-   $ git merge origin/master //merge with remote master
+   $ 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''