Changes between Version 43 and Version 44 of Developer/Git


Ignore:
Timestamp:
Feb 23, 2012, 11:50:57 PM (7 years ago)
Author:
Gedare
Comment:

/* Personal Repository */

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git

    v43 v44  
    352352     master pushes to master (up to date)
    353353}}}
     354=  Push commits to personal repo master from local master  =
     355
     356{{{
     357# git push
     358}}}
     359=  Push a branch onto personal repo  =
     360
     361{{{
     362# git push origin branchname
     363}}}
    354364=  Update from upstream master (RTEMS head)  =
    355365
    356 {{{
     366When you have no changes in your local master branch, use
     367{{{
     368 # git fetch upstream
     369 # git checkout master
     370 # git merge upstream/master
     371}}}
     372(Iit is the same as a git pull).
     373=  Update and commit to RTEMS  =
     374
     375When you have changes and you want to propagate them upstream: (if you
     376have those changes on a separate branch)
     377{{{
     378# git checkout new_features
    357379# git fetch upstream
    358 # git merge upstream/master
    359 }}}
    360 =  Push commits to personal repo master from local master  =
    361 
    362 {{{
    363 # git push
    364 }}}
    365 =  Push a branch onto personal repo  =
    366 
    367 {{{
    368 # git push origin branchname
    369 }}}
    370 =  Push your changes to upstream (RTEMS head)  =
    371 
    372 {{{
    373 # git push upstream master
    374 }}}
     380# git rebase upstream/master
     381# git push upstream new_features:master
     382}}}
     383
    375384If someone pushed since you updated the server rejects your push until you are up to date.
    376385=  GIT Push Configuration  =