Merge branch 'vcs'

Conflicts:
	ranger/gui/widgets/__init__.py

2 files changed, 24 insertions, 0 deletions

diff --git a/doc/ranger.1 b/doc/ranger.1
index d23b96fd..9296084f 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -690,6 +690,18 @@ Set the title to \*(L"ranger\*(R" in the tmux program?
 .IP "use_preview_script [bool] <zv>" 4
 .IX Item "use_preview_script [bool] <zv>"
 Use the preview script defined in the setting \fIpreview_script\fR?
+.IP "vcs_aware [bool]" 4
+.IX Item "vcs_aware [bool]"
+Gather and display data about version control systems. Supported vcs: git, hg.
+.IP "vcs_backend_git, vcs_backend_hg, vcs_backend_bzr [string]" 4
+.IX Item "vcs_backend_git, vcs_backend_hg, vcs_backend_bzr [string]"
+Sets the state for the version control backend. The possible values are:
+.Sp
+.Vb 3
+\& disabled   don\*(Aqt display any information.
+\& local      display only local state.
+\& enabled    display both, local and remote state. May be slow for hg and bzr.
+.Ve
 .IP "xterm_alt_key [bool]" 4
 .IX Item "xterm_alt_key [bool]"
 Enable this if key combinations with the Alt Key don't work for you.
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 748e48b3..2a314e74 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -689,6 +689,18 @@ Set the title to "ranger" in the tmux program?
 
 Use the preview script defined in the setting I<preview_script>?
 
+=item vcs_aware [bool]
+
+Gather and display data about version control systems. Supported vcs: git, hg.
+
+=item vcs_backend_git, vcs_backend_hg, vcs_backend_bzr [string]
+
+Sets the state for the version control backend. The possible values are:
+    
+ disabled   don't display any information.
+ local      display only local state.
+ enabled    display both, local and remote state. May be slow for hg and bzr.
+
 =item xterm_alt_key [bool]
 
 Enable this if key combinations with the Alt Key don't work for you.