Show the active (instead of the default) keybindings in the help view

[tig.git] / tigrc.5.txt

diff --git a/tigrc.5.txt b/tigrc.5.txt
index 59149acf78bb3cd9e74e538af1eac00ec6678ecd..1376232bd90e23902b575251db6278c3e28c42bf 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -9,11 +9,9 @@ tigrc - tig configuration file
 SYNOPSIS
 --------
 [verse]
-.............................................................................
 *set*   'variable' *=* 'value'
 *bind*  'keymap' 'key' 'action'
 *color* 'area' 'fgcolor' 'bgcolor' '[attributes]'
-.............................................................................
 
 
 DESCRIPTION
@@ -38,9 +36,7 @@ A few selective variables can be configured via the set command. The syntax
 is:
 
 [verse]
-..............................................................................
 *set* variables *=* value
-..............................................................................
 
 Examples:
 
@@ -125,6 +121,14 @@ The following variables can be set:
        always ensured that at least one column is scrolled. The default is to
        scroll '50%' of the view width.
 
+'split-view-height' (mixed)::
+
+       Height of the lower view in a split view. Can be specified either as
+       the number of rows, e.g. '5', or as a percentage of the view height,
+       e.g. '80%', where the maximum is 100%. It is always ensured that the
+       smaller of the views is at least four rows high. The default is a view
+       height of '66%'.
+
 'commit-encoding' (string)::
 
        The encoding used for commits. The default is UTF-8. Not this option
@@ -138,9 +142,7 @@ Using bind commands keys can be mapped to an action when pressed in a given
 key map. The syntax is:
 
 [verse]
-..............................................................................
 *bind* 'keymap' 'key' 'action'
-..............................................................................
 
 Examples:
 
@@ -176,7 +178,8 @@ built-in keybindings.
 Keymaps::
 
 Valid keymaps are: *main*, *diff*, *log*, *help*, *pager*, *status*, *stage*,
-and *generic*.  Use *generic* to set key mapping in all keymaps.
+*tree*, *blob*, *blame*, *branch*, and *generic*.  Use *generic* to set key
+mapping in all keymaps.
 
 Key values::
 
@@ -221,7 +224,20 @@ Browsing state variables
 ------------------------------------------------------------------------------
 
 As an example, the following external command will save the current commit as
-a patch file: "!git format-patch -1 %(commit)".
+a patch file: "!git format-patch -1 %(commit)". If your external command
+require use of dynamic features, such as subshells, expansion of environment
+variables and process control, this can be achieved by using a combination of
+git aliases and tig external commands. The following example entries can be
+put in either the .gitconfig or .git/config file:
+
+--------------------------------------------------------------------------
+[alias]
+       gitk-bg = !"gitk HEAD --not $(git rev-parse --remotes) &"
+       publish = !"for i in origin public; do git push $i; done"
+[tig "bind"]
+       generic = V !git gitk-bg
+       generic = > !git publish
+--------------------------------------------------------------------------
 
 ifdef::backend-xhtml11[]
 [frame="none"]
@@ -235,6 +251,7 @@ view-log            Show log view
 view-tree              Show tree view
 view-blob              Show blob view
 view-blame             Show blame view
+view-branch            Show branch view
 view-status            Show status view
 view-stage             Show stage view
 view-pager             Show pager view
@@ -320,6 +337,7 @@ screen-redraw               Redraw the screen
 screen-resize          Resize the screen
 show-version           Show version information
 stop-loading           Stop all loading views
+options                        Open options menu
 toggle-lineno          Toggle line numbers
 toggle-date            Toggle date display
 toggle-author          Toggle author display
@@ -339,9 +357,7 @@ background combinations to certain areas. Optionally, an attribute can be
 given as the last parameter. The syntax is:
 
 [verse]
-..............................................................................
 *color* 'area' 'fgcolor' 'bgcolor' '[attributes]'
-..............................................................................
 
 Examples: