Added color option main-revgraph to color the revision graph.

[tig.git] / tigrc.5.txt

diff --git a/tigrc.5.txt b/tigrc.5.txt
index fa4f47369627161ac6cf50c5ab6fd304edeed964..521880b1051d799edac06008ade61e56e2b3dece 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -44,7 +44,7 @@ Examples:
 --------------------------------------------------------------------------
        set show-rev-graph = yes        # Show revision graph?
        set line-number-interval = 5    # Interval between line numbers
-       set tab-size = 8                # Number of spaces pr tab 
+       set tab-size = 8                # Number of spaces per tab
        set encoding = "UTF-8"          # Commit encoding
 --------------------------------------------------------------------------
 
@@ -112,6 +112,10 @@ Examples:
        bind diff b move-first-line
        # 'unbind' the default quit key binding
        bind main Q none
+       # An external command to update from upstream
+       bind generic F !git fetch
+       # Cherry-pick current commit unto current branch
+       bind generic C !git cherry-pick %(commit)
 --------------------------------------------------------------------------
 
 Keys are mapped by first searching the keybindings for the current view, then
@@ -148,6 +152,14 @@ e.g. "view-main", "View.Main", and "VIEW_MAIN" are the same.
 Actions
 ~~~~~~~
 
+Apart from the action names listed below, all actions starting with a '!' will
+be available as an external command. External commands can contain variable
+names that will be substituted before the command is run. Valid variable names
+are "%(head)", "%(commit)", and "%(blob)".
+
+As an example, the following external command will save the current commit as
+a patch file: "!git format-patch %(commit)^..%(commit)".
+
 ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
@@ -233,8 +245,8 @@ stop-loading                Stop all loading views
 toggle-lineno          Toggle line numbers
 toggle-rev-graph       Toggle revision graph visualization
 status-update          Update file status
+status-merge           Resolve unmerged file
 edit                   Open in editor
-cherry-pick            Cherry-pick commit to current branch
 ------------------------------------------------------------------------------
 
 
@@ -312,7 +324,7 @@ Appearance of the various columns in the main view, including the '~' used for
 delimiting long author names and labels for tag and branch references.
 
 *main-date*, *main-author*, *main-commit*, *main-delim*, *main-tag*,
-*main-ref*, *main-remote*
+*main-ref*, *main-remote*, *main-revgraph*
 
 --
 
@@ -336,7 +348,7 @@ Extra diff information emitted by the git diff machinery, such as mode
 changes, rename detection, and similarity.
 
 *diff-oldmode*, *diff-newmode*, *diff-copy-from*, *diff-copy-to*,
-*diff-rename-from*, *diff-rename-to*, *diff-similarity* *diff-dissimilarity*
+*diff-rename-from*, *diff-rename-to*, *diff-similarity*, *diff-dissimilarity*
 *diff-tree*, *diff-index*
 
 Pretty print commit headers::
@@ -345,7 +357,8 @@ Commit diffs and the revision logs are usually formatted using pretty printed
 headers , unless `--pretty=raw` was given. This includes lines, such as merge
 info, commit ID, and author and committer date.
 
-*pp-author*, *pp-commit*, *pp-merge*, *pp-date*, *pp-adate*, *pp-cdate*
+*pp-author*, *pp-commit*, *pp-merge*, *pp-date*, *pp-adate*, *pp-cdate*,
+*pp-refs*
 
 Raw commit header::
 
@@ -360,6 +373,18 @@ For now only `Signed-off-by` and `Acked-by` lines are colorized.
 
 *signoff*, *acked*
 
+Tree markup::
+
+Colors for information of the tree view.
+
+*tree-dir*, *tree-file*
+
+Status markup::
+
+Colors used in the status view.
+
+*stat-section*, *stat-none*, *stat-staged*, *stat-unstaged*, *stat-untracked*
+
 --
 
 COPYRIGHT