Changes between Version 12 and Version 13 of Developer/Git/Committers


Ignore:
Timestamp:
03/30/12 03:12:31 (12 years ago)
Author:
Gedare
Comment:

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

Legend:

Unmodified
Added
Removed
Modified

  • Developer/Git/Committers

    v12 v13  
    8282==  Update from upstream master (RTEMS head)  ==
    8383
    84 When you have '''no changes''' in your local master branch, use
    85 {{{
    86  # git fetch upstream
    87  # git checkout master
    88  # git merge upstream/master
    89 }}}
    90 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 and avoid merge commit messages.
     84When 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.
    9185{{{
    9286# git checkout new_features
    93 # git fetch upstream
    94 # git rebase upstream/master
     87# git pull --rebase upstream master
    9588}}}
    96 This is the same as a ''git pull -rebase''.
    9789
    9890When you have committed changes on a branch that is public/shared with another developer you should not rebase that branch. TODO: what to do...