oofem-wiki

User Tools

Site Tools

Trace: • slump-flow
git-tutorial

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revisionBoth sides next revision
git-tutorial [2012/12/29 23:43] – smilauergit-tutorial [2012/12/29 23:46] – smilauer
Line 133: Line 133:
 If you already have oofem.git directory from a previous time, you can update ''master'' branch. If you already have oofem.git directory from a previous time, you can update ''master'' branch.
  
-   $ (git diff master origin/master)  //see the differences between local and remote masters+   $ (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 checkout master
    $ git pull --rebase    $ git pull --rebase
git-tutorial.txt · Last modified: 2017/11/01 09:08 by bp