From: Bill Traynor <wmat@alphatroop.com>
Date: Wed, 18 Apr 2012 20:56:10 +0000 (-0400)
Subject: HACKING: Fix instruction for git pull --rebase
X-Git-Tag: v0.6.0-rc1~141
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c2207e852e0e2564e3b053600effb1bd44a4b486;p=openocd

HACKING: Fix instruction for git pull --rebase

When following the Patch Guidelines step by step,
an error occurs at step 6.

"git pull --rebase origin/master" results in the error:

fatal: 'origin/master' does not appear to be a git repository

Removing the / seems to fix this.

Change-Id: I4e2fa23c60654abeaebd3b25a8c8375aa07b0abd
Signed-off-by: Bill Traynor <wmat@alphatroop.com>
Signed-off-by: Peter Stuge <peter@stuge.se>
Reviewed-on: http://openocd.zylin.com/574
Reviewed-by: David Anders <danders.dev@gmail.com>
Tested-by: jenkins
---

diff --git a/HACKING b/HACKING
index 47169ee7..7cd5b235 100644
--- a/HACKING
+++ b/HACKING
@@ -122,7 +122,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