mirror of
https://github.com/gcushen/hugo-academic.git
synced 2025-07-26 19:15:16 +02:00
Edit README
This commit is contained in:
parent
a1701292c9
commit
20deaf8ed7
1 changed files with 1 additions and 2 deletions
|
@ -62,9 +62,8 @@ To list available updates:
|
||||||
$ git fetch upstream
|
$ git fetch upstream
|
||||||
$ git log --pretty=oneline --abbrev-commit --decorate HEAD..upstream/master
|
$ git log --pretty=oneline --abbrev-commit --decorate HEAD..upstream/master
|
||||||
|
|
||||||
Upgrade by running:
|
Then, upgrade by running:
|
||||||
|
|
||||||
$ cd themes/academic
|
|
||||||
$ git pull upstream
|
$ git pull upstream
|
||||||
|
|
||||||
If you have modified files in `themes/academic`, git will attempt to auto-merge changes. If conflicts are reported, you will need to manually edit the files with conflicts and add them back (`git add <filename>`).
|
If you have modified files in `themes/academic`, git will attempt to auto-merge changes. If conflicts are reported, you will need to manually edit the files with conflicts and add them back (`git add <filename>`).
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue