Revert "target: remove unused working area 'user' field"

[fw/openocd] / HACKING

diff --git a/HACKING b/HACKING
index 47169ee72552930bc2e04cdf1d68245be381b23d..a379f92619e68bc6ef50a3ddd44383f73ed33c16 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -47,14 +47,8 @@ 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<br>
-     .
-     While these pages describe the setting up of git as well,
-     you should scroll down the page till you get to the section:
-     <i>Next: Set Up SSH Keys</i>, 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
@@ -69,12 +63,12 @@ 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
@@ -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