3 files changed, 16 insertions, 0 deletions

diff --git a/doc/ranger.pod b/doc/ranger.pod
index a06bc6ca..c388aaf7 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -690,6 +690,15 @@ 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_backends [list]
+
+List of vcs backends to use. By default it is ['git', 'hg'], but can be set to
+handle only 'git' repositories, for example.
+
 =item xterm_alt_key [bool]
 
 Enable this if key combinations with the Alt Key don't work for you.
diff --git a/ranger/config/rc.conf b/ranger/config/rc.conf
index 5ca31038..bc9d89e8 100644
--- a/ranger/config/rc.conf
+++ b/ranger/config/rc.conf
@@ -43,6 +43,11 @@ set preview_script ~/.config/ranger/scope.sh
 # Use the external preview script or display simple plain text previews?
 set use_preview_script true
 
+# Be aware of version control systems and display information about their
+# state. Supported version control systems: git, mercurial, bzr.
+set vcs_aware false
+set vcs_backends git,hg
+
 # Preview images in full color with the external command "w3mimgpreview"?
 set preview_images false
 
diff --git a/ranger/container/settingobject.py b/ranger/container/settingobject.py
index 3e5c287f..c5148e6d 100644
--- a/ranger/container/settingobject.py
+++ b/ranger/container/settingobject.py
@@ -45,6 +45,8 @@ ALLOWED_SETTINGS = {
     'update_title': bool,
     'update_tmux_title': bool,
     'use_preview_script': bool,
+    'vcs_aware': bool,
+    'vcs_backends': list,
     'xterm_alt_key': bool,
 }