<script src="../../assets/javascripts/bundle.c8d2eff1.min.js"></script>
- <script src="../../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+ <script src="../../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
</body>
<h1 id="git">Git</h1>
<p>Set upstream:
-* <code>git push --set-upstream remote_name local_branch</code>
-* <code>git pull --set-upstream remote_name local_branch</code></p>
-<p>Delete branch:
-* <code>git branch -d xxx</code>
-* <code>git branch -D xxx</code> (force delete)
-* <code>git push MY_REMOTE --delete XXX</code>
-* <code>git push MY_REMOTE :XXX</code> (identical to above)</p>
+- <code>git push --set-upstream remote_name local_branch</code>
+- <code>git pull --set-upstream remote_name local_branch</code></p>
+<p>Delete branch:</p>
+<ul>
+<li><code>git branch -d xxx</code></li>
+<li><code>git branch -D xxx</code> (force delete)</li>
+<li><code>git push MY_REMOTE --delete XXX</code></li>
+<li><code>git push MY_REMOTE :XXX</code> (identical to above)</li>
+</ul>
<p>Move branch
* <code>git checkout OLD_NAME</code>
* <code>git branch -m NEW_NAME</code></p>
--- /dev/null
+site_name: Niki's Doc
+theme:
+ name: material
+ features:
+ - content.action.edit
+plugins:
+ - privacy
+# - offline
+#repo_url: https://github.com/nikiroo/fanfix
+# repo_name: squidfunk/mkdocs-material
+#edit_uri: edit/master/docs/
--- /dev/null
+#!/bin/sh
+
+DDIR=/home/user/Notes
+
+if [ "$1" = "" ]; then
+ # Host
+ cd "`dirname "$0"`"
+ if [ $? != 0 ]; then
+ echo Cannot find directory \
+ | tee mkdocs/error.txt >&2
+ exit 42
+ fi
+ cd ..
+ rm -f mkdocs/ok mkdocs/error.txt
+ touch mkdocs/wip
+ OPTS="-v $PWD:$DDIR:rw" /opt/docker/launch.sh \
+ --start $DDIR/mkdocs/update.sh mkdocs \
+ build
+ echo
+ echo Leaving docker machine...
+ echo
+ [ -e mkdocs/ok ] ; rep=$? ; rm -f mkdocs/ok
+ if [ $rep = 0 ]; then
+ echo Copying to remote site...
+ cd mkdocs/site
+ git add .
+ if [ $? != 0 ]; then
+ echo Failure to add newly built html site \
+ | tee mkdocs/error.txt >&2
+ exit 20
+ fi
+ git commit -m "`date +"Auto commit %Y-%m-%d %H:%M"`"
+ if [ $? != 0 ]; then
+ echo Failure to commit to git \
+ | tee mkdocs/error.txt >&2
+ exit 21
+ fi
+ git push nikiroo html
+ if [ $? != 0 ]; then
+ echo Failure to push html branch to nikiroo \
+ | tee mkdocs/error.txt >&2
+ exit 22
+ fi
+ else
+ echo Failed to update, no remote copy started: $rep \
+ | tee mkdocs/error.txt >&2
+ fi
+ rm -f mkdocs/wip
+ exit $rep
+fi
+
+# Docker
+echo
+echo Entering docker machine...
+echo
+
+cd
+cp "$DDIR/mkdocs/mkdocs.yml" "$HOME/" || exit
+ln -s "$DDIR" docs || exit
+mkdocs build -d "$DDIR"/mkdocs/site || exit
+touch "$DDIR/mkdocs/ok"
+
<script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
- <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+ <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
</body>
<script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
- <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+ <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
</body>
<script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
- <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+ <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
</body>