summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2018-12-24 10:04:08 -0800
committerMichael Forney <mforney@mforney.org>2018-12-27 19:05:52 -0800
commitbc23a84dd59c1ff332172b7a772063fbc33bb555 (patch)
tree711391c8a3ae14d4596ebc5fdc85b02719c5a62b
parent952909cb8250a6ee54baa0939630a9d07cc1a49c (diff)
README: Default merge branch is set in config
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 203b68aa..558bdaca 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Updating your system is as simple as
git -C /src/oasis pull
samu -C /src/oasis commit
- doas git -C / merge oasis
+ doas git -C / merge
For more information, see the [wiki].