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
This commit is contained in:
parent
6a1236a7ac
commit
c2207e852e
2
HACKING
2
HACKING
|
@ -122,7 +122,7 @@ Signed-off-by: ...
|
||||||
are on top of the latest stuff on the server and
|
are on top of the latest stuff on the server and
|
||||||
that there are no conflicts:
|
that there are no conflicts:
|
||||||
@code
|
@code
|
||||||
git pull --rebase origin/master
|
git pull --rebase origin master
|
||||||
@endcode
|
@endcode
|
||||||
-# Send the patches to the Gerrit server for review:
|
-# Send the patches to the Gerrit server for review:
|
||||||
@code
|
@code
|
||||||
|
|
Loading…
Reference in New Issue