Skip to content

Commit 007b405

Browse files
committed
Fix small typo and additional info on subtree merge in README
1 parent 3fa8af2 commit 007b405

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ git subtree add --prefix=vimhelp vimhelp/master --squash
1616

1717
Command used for staying in sync and pulling from upstream:
1818
```
19-
git subtree merge --prefix=vimhelp vimhelp/master --squash
19+
git fetch vimhelp
20+
git subtree merge -m "Merge subtree 'vimhelp' from 'vimhelp/master'" --prefix=vimhelp vimhelp/master --squash
2021
```
2122

2223
## Running locally
@@ -41,7 +42,7 @@ Then run the script (make sure to substitute `$macvim_dir` with the directory th
4142
scripts/h2h.py -i $macvim_dir/runtime/doc -o ../build --project macvim --web-version --output-tags-json
4243
```
4344

44-
You can then run a simple web server in the build folder and browser to it. E.g. Use Python to server a server (it will be available at http://localhost:8000):
45+
You can then run a simple web server in the build folder and browse to it. E.g. Use Python to server a server (it will be available at http://localhost:8000):
4546

4647
```
4748
cd build

0 commit comments

Comments
 (0)