X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=HACKING;h=658aa76b592c13379584a2b9953eedf32438308d;hb=refs%2Fchanges%2F18%2F918%2F5;hp=5edf1012f6f0754358946c82a14bd39c9d9757a1;hpb=a6cf60c9c2387ca9f6c5a916ebf3d164554a7165;p=openocd.git
diff --git a/HACKING b/HACKING
index 5edf1012f6..658aa76b59 100644
--- a/HACKING
+++ b/HACKING
@@ -47,34 +47,28 @@ Add yourself to the GPL copyright for non-trivial changes.
add a username of your choice.
Your username will be required in step 3 and substituted wherever
the string 'USERNAME' is found.
- -# Add an SSH public key following the directions for your specific platform:
- - for Windows: http://help.github.com/win-set-up-git/#_set_up_ssh_keys
- - for OSX: http://help.github.com/mac-set-up-git/#_set_up_ssh_keys
- - for Linux: http://help.github.com/linux-set-up-git/#_set_up_ssh_keys
- .
- While these pages describe the setting up of git as well,
- you should scroll down the page till you get to the section:
- Next: Set Up SSH Keys, and follow the steps described.
+ -# Add an SSH public key following the directions on github:
+ https://help.github.com/articles/generating-ssh-keys
-# Clone the git repository, rather than just download the source:
@code
- git clone git://openocd.git.sourceforge.net/gitroot/openocd/openocd
+ git clone git://git.code.sf.net/p/openocd/code openocd
@endcode
or if you have problems with the "git:" protocol, use
the slower http protocol:
@code
- git clone http://repo.or.cz/r/openocd.git
+ git clone http://git.code.sf.net/p/openocd/code openocd
@endcode
-# Set up Gerrit with your local repository. All this does it
to instruct git locally how to send off the changes.
-# Add a new remote to git using Gerrit username:
@code
git remote add review ssh://USERNAME@openocd.zylin.com:29418/openocd.git
-git config remote.review.push HEAD:refs/for/master
+git config remote.review.push HEAD:refs/publish/master
@endcode
Or with http only:
@code
git remote add review http://openocd.zylin.com/p/openocd.git
-git config remote.review.push HEAD:refs/for/master
+git config remote.review.push HEAD:refs/publish/master
@endcode
-# You will need to install this hook, we will look into a better solution:
@code
@@ -90,7 +84,7 @@ chmod +x .git/hooks/commit-msg
@code
tools/initial.sh
@endcode
-With being your Gerrit username.
+With @ being your Gerrit username.
-# Set up git with your name and email:
@code
git config --global user.name "John Smith"
@@ -122,7 +116,7 @@ Signed-off-by: ...
are on top of the latest stuff on the server and
that there are no conflicts:
@code
-git pull --rebase origin/master
+git pull --rebase origin master
@endcode
-# Send the patches to the Gerrit server for review:
@code