Changes between Version 2 and Version 3 of Developer/Git/Committers


Ignore:
Timestamp:
Mar 1, 2012, 7:05:30 PM (7 years ago)
Author:
Gedare
Comment:

/* Personal Repository */

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git/Committers

    v2 v3  
    4747
    4848After a little while you should be able to see your personal repo at http://git.rtems.org/user/rtems.git/ and you can create other repositories in your git directory that will propagate to http://git.rtems.org/user if you need.
    49 =  Check your setup  =
     49==  Check your setup  ==
    5050
    5151{{{
     
    6868     master pushes to master (up to date)
    6969}}}
    70 =  Push commits to personal repo master from local master  =
     70==  Push commits to personal repo master from local master  ==
    7171
    7272{{{
    7373# git push
    7474}}}
    75 =  Push a branch onto personal repo  =
     75==  Push a branch onto personal repo  ==
    7676
    7777{{{
    7878# git push origin branchname
    7979}}}
    80 =  Update from upstream master (RTEMS head)  =
     80==  Update from upstream master (RTEMS head)  ==
    8181
    82 When you have no changes in your local master branch, use
     82When you have 'no changes' in your local master branch, use
    8383{{{
    8484 # git fetch upstream
     
    8686 # git merge upstream/master
    8787}}}
    88 This is the same as a git pull.
    89 =  Update and commit to RTEMS  =
    90 
    91 When you have changes and you want to propagate them upstream: (if you
    92 have those changes on a separate branch)
     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.
    9389{{{
    9490# git checkout new_features
    9591# git fetch upstream
    9692# git rebase upstream/master
    97 # git push upstream new_features:master
    9893}}}
    99 
    100 If someone pushed since you updated the server rejects your push until you are up to date.
     94When you have committed changes on a branch that is public you should not rebase that branch. TODO: what to do...
    10195=  GIT Push Configuration  =
    10296