summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Traynor <wmat@alphatroop.com>2012-04-18 16:56:10 -0400
committerPeter Stuge <peter@stuge.se>2012-04-18 23:21:27 +0000
commitc2207e852e0e2564e3b053600effb1bd44a4b486 (patch)
treee7be999bd7ee1f4b09e54fcd3c46949810090aa6
parent6a1236a7ac10fd025c6fe6eb09ad93cad1697879 (diff)
downloadopenocd-c2207e852e0e2564e3b053600effb1bd44a4b486.tar.gz
openocd-c2207e852e0e2564e3b053600effb1bd44a4b486.tar.xz
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
-rw-r--r--HACKING2
1 files changed, 1 insertions, 1 deletions
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