diff options
| author | Tim Newsome <tim@sifive.com> | 2019-02-08 14:39:47 -0800 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2019-02-08 14:39:47 -0800 |
| commit | 1c6d52cd88076cf22e55e0294cbb9751a3492470 (patch) | |
| tree | aaa36ec90b01caccadfe2c07932f2a22e3967d0c /tools | |
| parent | 80ef54dba2411f9354b3793d5832c5d8ad871b4b (diff) | |
| parent | 6c2020eb48803b941a94d600e2a96728d05a7da9 (diff) | |
| download | riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.zip riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.tar.gz riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
README
contrib/loaders/flash/fespi/Makefile
src/flash/nor/fespi.c
src/flash/nor/spi.c
Change-Id: I78a4e73685cc95daace95e9d16066a6fb51034fb
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/initial.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/initial.sh b/tools/initial.sh index 9580c9a..446b98b 100755 --- a/tools/initial.sh +++ b/tools/initial.sh @@ -12,7 +12,7 @@ add_remote() remote_exist=`grep remote .git/config | grep review | wc -l` if [ "x$remote_exist" = "x0" ] ; then git remote add review ssh://$USERNAME@openocd.zylin.com:29418/openocd.git - git config remote.review.push HEAD:refs/publish/master + git config remote.review.push HEAD:refs/for/master else echo "Remote review exists" fi |