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

Timestamp:

03/15/15 06:41:01 (9 years ago)

Author:

Chris Johns

Comment:

Update after rename.

Developer/Git/Users

@@ -1 +1 @@
 = Git Users =
 
-
-
-[[TOC(Developer/GitUsers, depth=2)]]
-
+[[TOC(Developer/Git/Users, depth=2)]]
 
 TODO: Managing a (private/public) git mirror, using github, submitting pull requests...
+
 = Browse the GIT Repository Online =
-
 
 You can browse all available repositories online by accessing http://git.rtems.org/.
@@ -71 +68 @@
 }}}
 But 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.
+
 = Working with Branches =
 
@@ -115 +113 @@
 }}}
 If you have unmerged changes in the old branch git complains and you need to use -D instead of -d.
+
 = Viewing Changes =
-
 
 To view all changes since the last commit:
@@ -224 +222 @@
 }}}
 If 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
+
 = Rebasing =
 
@@ -246 +245 @@
 
 There 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.
+
 = Accessing a developer's repository =
 
 RTEMS 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.
+
 = Creating a Patch =
 
@@ -264 +265 @@
  git config --global user.email name@domain.com
 }}}
+
 = Submitting a Patch =
 
@@ -289 +291 @@
  git config --global sendemail.smtppass your_password
 }}}
+
 = Sending Email =
 
@@ -310 +313 @@
  git send-email /path/to/patch
 }}}
+
 =  Troubleshooting  =
 
-
 Some 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:
 
@@ -320 +323 @@
 
 This access through http is slower (way slower!) than through the git protocol therefore the git protocol is preferred.  
+
 =  Manage Your Code  =
-
 
 You 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.
@@ -371 +374 @@
 git branch -d anewbranch
 }}}
+
 =  Learn more about Git  =