X-Git-Url: http://git.openafs.org/?p=openafs-wiki.git;a=blobdiff_plain;f=AFSLore%2FGitDevelopers.mdwn;h=5fd95d2659ba6dd71ce13b982cbf464e6816f1f8;hp=d3872fbd8603027783c4fbe157802a5629ea62dd;hb=78bd623378b72dee56c6c46b6cf0d084fc9d3d64;hpb=3bd0ca5b53d2cc727ba08cb265c3576b5d6e15ce
diff --git a/AFSLore/GitDevelopers.mdwn b/AFSLore/GitDevelopers.mdwn
index d3872fb..5fd95d2 100644
--- a/AFSLore/GitDevelopers.mdwn
+++ b/AFSLore/GitDevelopers.mdwn
@@ -2,7 +2,7 @@
Git opens up a number of new options for contributing to OpenAFS. For the first time, it is easy to review code that is pending addition to the OpenAFS tree. In fact, reviewing code is one of the best ways to ensure that the releases that OpenAFS ships remain stable and functional. If you are interested purely in reviewing, then please skip to that section towards the end of this document.
-Git also changes the way that developers interact with the OpenAFS tree. Instead of just having a single version of the tree on your local machine, you have a compressed copy of the entire repository. Additionally, you no longer have to produce patches to send code upstream - any developer can push into the OpenAFS repository directly, through gerrit, our code review tool. [New Home Construction](http://www.dwh.co.uk)
+Git also changes the way that developers interact with the OpenAFS tree. Instead of just having a single version of the tree on your local machine, you have a compressed copy of the entire repository. Additionally, you no longer have to produce patches to send code upstream - any developer can push into the OpenAFS repository directly, through gerrit, our code review tool.
Whilst git is a far more powerful tool than CVS it is also, inevitably, more complex. This document can only scratch the surface of what's possible with git - there are many, many, documents available that describe git in greater detail, and references to some of them are provided at the end.
@@ -60,7 +60,7 @@ or by creating a topic branch as discussed below.
## Checkout a particular release
-Every release version of [[OpenAFS]] is marked in the repository by means of a tag. [PPI Claims UK](http://www.gladstonebrookes.co.uk/)
+Every release version of [[OpenAFS]] is marked in the repository by means of a tag.
A complete list of all tags can be obtained by running
@@ -121,7 +121,7 @@ For example, to work on a patch to fix printf warnings, based on the current dev
This puts me on a new branch, ready to start writing code. All new development should be based upon the origin/master branch, submissions based upon other branches are unlikely to be accepted, unless they address issues that are solely present in that branch.
-'git add' is used to tell git about any new files you create as part of your patch. If your patch results in any new compilation products (object files, new executables, etc) that git should not be tracking, please make sure that they're caught by the .gitignore mechanism. You can do this by checking that they don't appear in the output from 'git status' [Data Recovery Austin](http://www.securedatarecovery.com/data-recovery-austin.html)
+'git add' is used to tell git about any new files you create as part of your patch. If your patch results in any new compilation products (object files, new executables, etc) that git should not be tracking, please make sure that they're caught by the .gitignore mechanism. You can do this by checking that they don't appear in the output from 'git status'.
'git mv' and 'git rm' are used to move and delete files respectively.
@@ -244,7 +244,7 @@ Other mechanisms of listing the change to push are available - see Updating your change
-It's possible that your change may have been made against a tree which is too old for it to apply to the tip. In this case, gerrit will let you know that there is a collision, and request that you update the change to the tip. [Buy Homes](http://www.barratthomes.co.uk/Find-a-Home/)
+It's possible that your change may have been made against a tree which is too old for it to apply to the tip. In this case, gerrit will let you know that there is a collision, and request that you update the change to the tip.
You can do this with