Changes between Version 14 and Version 15 of Developer/Git/Users


Ignore:
Timestamp:
Mar 15, 2015, 6:41:01 AM (5 years ago)
Author:
Chris Johns
Comment:

Update after rename.

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git/Users

    v14 v15  
    11= Git Users =
    22
    3 
    4 
    5 [[TOC(Developer/GitUsers, depth=2)]]
    6 
     3[[TOC(Developer/Git/Users, depth=2)]]
    74
    85TODO: Managing a (private/public) git mirror, using github, submitting pull requests...
     6
    97= Browse the GIT Repository Online =
    10 
    118
    129You can browse all available repositories online by accessing http://git.rtems.org/.
     
    7168}}}
    7269But you shouldn't do any of this on the branch that you cloned, instead you should create a new branch to work with, so that the cloned branch (master) is a pristine copy of the upstream RTEMS repository.
     70
    7371= Working with Branches =
    7472
     
    115113}}}
    116114If you have unmerged changes in the old branch git complains and you need to use -D instead of -d.
     115
    117116= Viewing Changes =
    118 
    119117
    120118To view all changes since the last commit:
     
    224222}}}
    225223If all goes well the new commits you pulled into your master branch will be merged into your branch1, which will now be up-to-date. However, if branch1 has not been pushed remotely then rebasing might be a good alternative to merging because the merge generates a commit
     224
    226225= Rebasing =
    227226
     
    246245
    247246There is one caveat to using rebase: Do not rebase commits that you have pushed to a public repository. Rebase abandons existing commits and creates new ones that are similar but different. If you push commits that others pull down, and then you rewrite those commits with git rebase and push them up again, the others will have to re-merge their work and trying to integrate their work into yours can become messy.
     247
    248248= Accessing a developer's repository =
    249249
    250250RTEMS developers with Git commit access have personal repositories on http://git.rtems.org/ that can be [wiki:Git_Committers#Pull_a_Developer's_Repo pulled] to view cutting edge development work shared there.
     251
    251252= Creating a Patch =
    252253
     
    264265 git config --global user.email name@domain.com
    265266}}}
     267
    266268= Submitting a Patch =
    267269
     
    289291 git config --global sendemail.smtppass your_password
    290292}}}
     293
    291294= Sending Email =
    292295
     
    310313 git send-email /path/to/patch
    311314}}}
     315
    312316=  Troubleshooting  =
    313317
    314 
    315318Some restrictive corporate firewalls block access through the git protocol (git://) If you are unable to reach the server git://git.rtems.org/ you can try accessing through http. To clone the rtems repository using the http protocol use the following command:
    316319
     
    320323
    321324This access through http is slower (way slower!) than through the git protocol therefore the git protocol is preferred. 
     325
    322326=  Manage Your Code  =
    323 
    324327
    325328You may prefer to keep your application and development work in a git repository for all the good reasons that come with version control. For public repositories, you may like to try [https://github.com GitHub] or [https://bitbucket.org/ BitBucket]. RTEMS maintains mirrors on GitHub, which can make synchronizing with upstream changes relatively simple. If you need to keep your work private, you can use one of those services with private repositories or manage your own server. The details of setting up a server are outside the scope of this document, but if you have a server with ssh access you should be able to [http://git-scm.com/book/en/Git-on-the-Server-Setting-Up-the-Server find instructions] on how to set up git access. Once you have git configured on the server, adding repositories is a snap.
     
    371374git branch -d anewbranch
    372375}}}
     376
    373377=  Learn more about Git  =
    374378