aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2023-09-12 22:06:05 +0200
committerHugo Hörnquist <hugo@lysator.liu.se>2023-09-12 22:06:05 +0200
commit4c595519ef87abb61ae9d2fd454015effbec2968 (patch)
tree96b3184b4f902824214ee2e0c146c8347c5dfaf7
parenttis 22 aug 2023 21:28:55 CEST (diff)
downloadwiki-public-4c595519ef87abb61ae9d2fd454015effbec2968.tar.gz
wiki-public-4c595519ef87abb61ae9d2fd454015effbec2968.tar.xz
tis 12 sep 2023 22:06:04 CEST
-rw-r--r--Ordklasser.wiki11
-rw-r--r--git.wiki8
-rw-r--r--index.wiki1
3 files changed, 20 insertions, 0 deletions
diff --git a/Ordklasser.wiki b/Ordklasser.wiki
new file mode 100644
index 0000000..8084536
--- /dev/null
+++ b/Ordklasser.wiki
@@ -0,0 +1,11 @@
+== Substantiv ==
+Konkreta föremål, samt abstrakta objekt.
+
+Inkluderar sol, blomma, känsla, kärlek.
+
+== Verb ==
+== Adjektiv ==
+== Adverb ==
+== Pronomen ==
+== Adposition ==
+== Konjunktion / Subjunktion ==
diff --git a/git.wiki b/git.wiki
index 7ed5931..4b8c09c 100644
--- a/git.wiki
+++ b/git.wiki
@@ -5,6 +5,14 @@
:: If HEAD is on matching tag, show tag name, otherwise show
:: _<tag name>_-_<commits since>_-_<short hash>_
+== Merge base ==
+
+{{{sh
+git merge-base <commit> <commit>
+}}}
+
+Show the closest common ancestor of two commits.
+
== Git hook "syntax" highlighting ==
The output of git hooks are in some cases highlighted, see the
following examples (each directly echoed to stdout from a post-receive
diff --git a/index.wiki b/index.wiki
index f9ecb09..baa5b8c 100644
--- a/index.wiki
+++ b/index.wiki
@@ -118,6 +118,7 @@
- [[rv290]]
- [[IP addresses for documentation]]
- [[Märkesbackesmålning]]
+- [[Ordklasser]]
* [[diary/diary|Dagbok]]