oofem-wiki

User Tools

Site Tools

Trace:
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 revision		Previous revision
Next revisionBoth sides next revision
git-tutorial [2012/12/29 23:43] – smilauergit-tutorial [2014/01/23 18:46] – nitramkaroh
Line 85: Line 85:
  
 ==== Viewing the Commit History ==== ==== 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     git log
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