summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2015-12-08 12:00:39 -0400
committerJoey Hess2015-12-08 12:00:39 -0400
commitf11c4835d5952d885c678a49501b1dcc524316ad (patch)
treeb86635b1bd1bdffe530d4f3b7529cf6c564676b3 /doc
parent5ecb4944a637c4f28a15746b2ea716850e63a5ab (diff)
parent39c0073d2800e23b051188de239efdea9b17793e (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'doc')
-rw-r--r--doc/usage.mdwn8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 4eed5416..16e559fa 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -105,7 +105,7 @@ and configured in haskell.
* propellor --check
- If propellor is able to run, this simply exists successfully.
+ If propellor is able to run, this simply exits successfully.
* propellor hostname
@@ -124,6 +124,12 @@ other debugging information.
`git config propellor.debug 1` will configure propellor to output debugging
information.
+`git config propellor.spin-branch foo` will configure propellor to refuse to
+spin when the foo branch is not checked out.
+
+`git config propellor.forbid-dirty-spin true` will configure propellor to refuse
+to spin when there are uncommitted changes in the `~/.propellor` repository.
+
The usual git configuration controls which centralized repository (if any)
propellor pushes and pulls from.