summaryrefslogtreecommitdiff
path: root/doc/usage.mdwn
diff options
context:
space:
mode:
authorSean Whitton2015-12-06 17:04:22 -0700
committerJoey Hess2015-12-08 11:59:03 -0400
commitf7aa28042aa11957699d98031df052955f9d987e (patch)
treeeed401dd0ba2e050cbbc96066a3846efc8e4036b /doc/usage.mdwn
parent5c261fd69be879f3458128398bb6fbb605fb2e1a (diff)
document two new safety checks
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> (cherry picked from commit bf8af2d2dd3c5b08d53bef72d2dc0ae745d81f0c)
Diffstat (limited to 'doc/usage.mdwn')
-rw-r--r--doc/usage.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 4eed5416..57be293d 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -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.