summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-02-16 21:01:17 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-02-16 21:01:17 +1100
commite011e9bc4238b97a70ac6e4b35a862a028ce55e4 (patch)
treeb4812f422ee3b38844796617299a5cecc7835369 /docs
parentad93b4c863dfaa6a1cb6bb740d0dba87fef14404 (diff)
more work on rebasing feature
Diffstat (limited to 'docs')
-rw-r--r--docs/Config.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/Config.md b/docs/Config.md
index dfbbdb10b..c083fcb50 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -17,6 +17,10 @@
- blue
commitLength:
show: true
+ git:
+ merging:
+ # only applicable to unix users
+ manualCommit: false
update:
method: prompt # can be: prompt | background | never
days: 14 # how often an update is checked for