Changes between Version 6 and Version 7 of Developer/Git/Committers


Ignore:
Timestamp:
Mar 1, 2012, 8:49:52 PM (7 years ago)
Author:
Gedare
Comment:

/* Update from upstream master (RTEMS head) */

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git/Committers

    v6 v7  
    8686 # git merge upstream/master
    8787}}}
    88 This is the same as a git pull. When you have committed changes on a branch that is private (hasn't been pushed to your personal repo) then you can use rebase to obtain a linear history.
     88This is the same as a ''git pull''. When you have committed changes on a branch that is private (hasn't been pushed to your personal repo) then you can use rebase to obtain a linear history and avoid merge commit messages.
    8989{{{
    9090# git checkout new_features
     
    9292# git rebase upstream/master
    9393}}}
    94 When you have committed changes on a branch that is public you should not rebase that branch. TODO: what to do...
     94This is the same as a ''git pull -rebase''.
     95
     96When you have committed changes on a branch that is public/shared with another developer you should not rebase that branch. TODO: what to do...
    9597=  GIT Push Configuration  =
    9698