Make tig handle GIT_DIR better

[tig] / tigrc.5.txt

diff --git a/tigrc.5.txt b/tigrc.5.txt
index 5ae95b2..1b1df67 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -70,7 +70,7 @@ The following variables can be set:
 
 'show-rev-graph' (bool)::
 
 
 'show-rev-graph' (bool)::
 

-       Show revision graph in the main view on startup. Can be toggled with
+       Show revision graph in the main view on start-up. Can be toggled with

        'g'.
 
 'line-number-interval' (int)::
        'g'.
 
 'line-number-interval' (int)::


@@ -110,11 +110,13 @@ Examples:
        bind diff a previous
        bind diff d next
        bind diff b move-first-line
        bind diff a previous
        bind diff d next
        bind diff b move-first-line

+       # 'unbind' the default quit key binding
+       bind main Q none

 --------------------------------------------------------------------------
 
 Keys are mapped by first searching the keybindings for the current view, then
 the keybindings for the *generic* keymap, and last the default keybindings.
 --------------------------------------------------------------------------
 
 Keys are mapped by first searching the keybindings for the current view, then
 the keybindings for the *generic* keymap, and last the default keybindings.

-Thus, the view keybindings shaddow the generic keybindings which shaddow the
+Thus, the view keybindings shadow the generic keybindings which Shadow the

 built-in keybindings.
 
 --
 built-in keybindings.
 
 --


@@ -150,20 +152,22 @@ ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]

-View switching::
+View switching:

 ------------------------------------------------------------------------------
 view-main              Show main view
 view-diff              Show diff view
 view-log               Show log view
 ------------------------------------------------------------------------------
 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-pager             Show pager view
 view-pager             Show pager view

+view-help              Show help page

 ------------------------------------------------------------------------------
 
 ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]
 ------------------------------------------------------------------------------
 
 ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]

-View manipulation::
+View manipulation:

 ------------------------------------------------------------------------------
 enter                  Enter current line and scroll
 next                   Move to next
 ------------------------------------------------------------------------------
 enter                  Enter current line and scroll
 next                   Move to next


@@ -177,42 +181,42 @@ ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]

-Cursor navigation::
+Cursor navigation:

 ------------------------------------------------------------------------------
 move-up                        Move cursor one line up
 move-down              Move cursor one line down
 ------------------------------------------------------------------------------
 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[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]
 ------------------------------------------------------------------------------
 
 ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]

-Scrolling::
+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[]
 ------------------------------------------------------------------------------
 
 ifdef::backend-xhtml11[]
 [frame="none"]
 `-----------------------`-----------------------------------------------------
 endif::backend-xhtml11[]

-Misc::
+Misc:

 ------------------------------------------------------------------------------
 ------------------------------------------------------------------------------

+none                   Do nothing

 prompt                 Bring up the prompt
 prompt                 Bring up the prompt

-screen-update          Update the screen

 screen-redraw          Redraw the screen
 screen-resize          Resize the screen
 show-version           Show version information
 stop-loading           Stop all loading views
 toggle-lineno          Toggle line numbers
 screen-redraw          Redraw the screen
 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

 ------------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------------
 
 


@@ -221,7 +225,7 @@ Color command
 
 Color commands control highlighting and the user interface styles. If your
 terminal supports color, these commands can be used to assign foreground and
 
 Color commands control highlighting and the user interface styles. If your
 terminal supports color, these commands can be used to assign foreground and

-backgound combinations to certain areas. Optionally, an attribute can be given
+background combinations to certain areas. Optionally, an attribute can be given

 as the last parameter. The syntax is:
 
 [verse]
 as the last parameter. The syntax is:
 
 [verse]


@@ -275,7 +279,7 @@ Appearance of the bottom window showing info messages.
 
 Title window colors::
 
 
 Title window colors::
 

-Appearence of the title windows when they are attached
+Appearance of the title windows when they are attached

 to any backgrounded windows and the current window.
 
 *title-blur*, *title-focus*
 to any backgrounded windows and the current window.
 
 *title-blur*, *title-focus*


@@ -321,7 +325,7 @@ Pretty print commit headers::
 
 Commit diffs and the revision logs are usually formatted using pretty printed
 headers , unless `--pretty=raw` was given. This includes lines, such as merge
 
 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 comitter date.
+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*
 


@@ -334,9 +338,9 @@ omnipresent.
 
 Commit message::
 
 
 Commit message::
 

-For now only `Signed-off-by` lines are colorized.
+For now only `Signed-off-by` and `Acked-by` lines are colorized.

 
 

-*signoff*
+*signoff*, *acked*

 
 --
 
 
 --