Use --no-color option when calling git-log and git-diff

[tig] / tigrc.5.txt

diff --git a/tigrc.5.txt b/tigrc.5.txt
index d83b071..55e34a5 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -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
@@ -123,8 +127,8 @@ built-in keybindings.
 
 Keymaps::
 
-Valid keymaps are: *main*, *diff*, *log*, *help*, *pager*, and *generic*.  Use
-*generic* to set key mapping in all keymaps.
+Valid keymaps are: *main*, *diff*, *log*, *help*, *pager*, *status*, *stage*,
+and *generic*.  Use *generic* to set key mapping in all keymaps.
 
 Key values::
 
@@ -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"]
 `-----------------------`-----------------------------------------------------
@@ -157,8 +169,12 @@ View switching:
 view-main              Show main view
 view-diff              Show diff view
 view-log               Show log view
-view-help              Show help page
+view-tree              Show tree view
+view-blob              Show blob view
+view-status            Show status view
+view-stage             Show stage view
 view-pager             Show pager view
+view-help              Show help page
 ------------------------------------------------------------------------------
 
 ifdef::backend-xhtml11[]
@@ -171,6 +187,7 @@ enter                       Enter current line and scroll
 next                   Move to next
 previous               Move to previous
 view-next              Move focus to next view
+refresh                        Reload and refresh view
 view-close             Close the current view
 quit                   Close all views and quit
 ------------------------------------------------------------------------------
@@ -183,10 +200,10 @@ Cursor navigation:
 ------------------------------------------------------------------------------
 move-up                        Move cursor one line up
 move-down              Move cursor one line down
-move-page_down         Move cursor one page down
-move-page_up           Move cursor one page up
-move-first_line                Move cursor to first line
-move-last_line         Move cursor to last line
+move-page-down         Move cursor one page down
+move-page-up           Move cursor one page up
+move-first-line                Move cursor to first line
+move-last-line         Move cursor to last line
 ------------------------------------------------------------------------------
 
 ifdef::backend-xhtml11[]
@@ -195,10 +212,22 @@ ifdef::backend-xhtml11[]
 endif::backend-xhtml11[]
 Scrolling:
 ------------------------------------------------------------------------------
-scroll-line_up         Scroll one line up
-scroll-line_down       Scroll one line down
-scroll-page_up         Scroll one page up
-scroll-page_down       Scroll one page down
+scroll-line-up         Scroll one line up
+scroll-line-down       Scroll one line down
+scroll-page-eup                Scroll one page up
+scroll-page-down       Scroll one page down
+------------------------------------------------------------------------------
+
+ifdef::backend-xhtml11[]
+[frame="none"]
+`-----------------------`-----------------------------------------------------
+endif::backend-xhtml11[]
+Searching:
+------------------------------------------------------------------------------
+search                 Search the view
+search-back            Search backwards in the view
+find-next              Find next search match
+find-prev              Find previous search match
 ------------------------------------------------------------------------------
 
 ifdef::backend-xhtml11[]
@@ -214,7 +243,10 @@ screen-resize              Resize the screen
 show-version           Show version information
 stop-loading           Stop all loading views
 toggle-lineno          Toggle line numbers
-toggle-rev_graph       Toggle revision graph visualization
+toggle-rev-graph       Toggle revision graph visualization
+status-update          Update file status
+status-merge           Resolve unmerged file
+edit                   Open in editor
 ------------------------------------------------------------------------------
 
 
@@ -292,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-ref*, *main-remote*
 
 --
 
@@ -344,7 +376,7 @@ For now only `Signed-off-by` and `Acked-by` lines are colorized.
 
 COPYRIGHT
 ---------
-Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
+Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>
 
 Licensed under the terms of the GNU General Public License.