Remove unnecessary braces

[tig.git] / tigrc.5.txt

diff --git a/tigrc.5.txt b/tigrc.5.txt
index e3276ca5f04599699373c4dbd8e8c0b2f4c984b6..2d9afddd2dff47198d85112cfede22d164c78a46 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -97,11 +97,11 @@ The following variables can be set:
        How to display author names. If set to "abbreviated" author initials
        will be shown. Can be toggled.
 
        How to display author names. If set to "abbreviated" author initials
        will be shown. Can be toggled.
 

-'show-date' (mixed) ["relative" | "short" | "default" | bool]::
+'show-date' (mixed) ["relative" | "short" | "default" | "local" | bool]::

 
        Whether and how to show date. If set to "relative" a relative date will be
        used, e.g. "2 minutes ago". If set to "short" no time information is
 
        Whether and how to show date. If set to "relative" a relative date will be
        used, e.g. "2 minutes ago". If set to "short" no time information is

-       shown. Can be toggled.
+       shown. If set to "local", localtime(3) is used. Can be toggled.

 
 'author-width' (int)::
 
 
 'author-width' (int)::
 


@@ -140,9 +140,15 @@ The following variables can be set:
 
 'commit-encoding' (string)::
 
 
 'commit-encoding' (string)::
 

-       The encoding used for commits. The default is UTF-8. Not this option
+       The encoding used for commits. The default is UTF-8. Note this option

        is shadowed by the "i18n.commitencoding" option in `.git/config`.
 
        is shadowed by the "i18n.commitencoding" option in `.git/config`.
 

+'status-untracked-dirs' (bool)::
+
+       Show untracked directories contents in the status view (analog to
+       `git ls-files --directory` option. On by default.
+
+

 Bind command
 ------------
 
 Bind command
 ------------
 


@@ -222,10 +228,14 @@ are:
 |%(head)               |The currently viewed 'head' ID. Defaults to HEAD
 |%(commit)             |The currently selected commit ID.
 |%(blob)               |The currently selected blob ID.
 |%(head)               |The currently viewed 'head' ID. Defaults to HEAD
 |%(commit)             |The currently selected commit ID.
 |%(blob)               |The currently selected blob ID.

+|%(branch)             |The currently selected branch name.

 |%(directory)          |The current directory path in the tree view;
                         empty for the root directory.
 |%(file)               |The currently selected file.
 |%(ref)                        |The reference given to blame or HEAD if undefined.
 |%(directory)          |The current directory path in the tree view;
                         empty for the root directory.
 |%(file)               |The currently selected file.
 |%(ref)                        |The reference given to blame or HEAD if undefined.

+|%(revargs)            |The revision arguments passed on the command line.
+|%(fileargs)           |The file arguments passed on the command line.
+|%(diffargs)           |The diff options passed on the command line.

 |=============================================================================
 
 As an example, the following external command will save the current commit as
 |=============================================================================
 
 As an example, the following external command will save the current commit as


@@ -300,6 +310,7 @@ put in either the .gitconfig or .git/config file:
 |scroll-line-down      |Scroll one line down
 |scroll-page-up                |Scroll one page up
 |scroll-page-down      |Scroll one page down
 |scroll-line-down      |Scroll one line down
 |scroll-page-up                |Scroll one page up
 |scroll-page-down      |Scroll one page down

+|scroll-first-col       |Scroll to the first column

 |scroll-left           |Scroll one column left
 |scroll-right          |Scroll one column right
 |=============================================================================
 |scroll-left           |Scroll one column left
 |scroll-right          |Scroll one column right
 |=============================================================================


@@ -486,9 +497,9 @@ omnipresent.
 
 Commit message::
 
 
 Commit message::
 

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

 
 

-*signoff*, *acked*
+*signoff*, *acked*, *reviewed*, *tested*

 
 Tree markup::
 
 
 Tree markup::
 


@@ -500,7 +511,7 @@ Colors for information of the tree view.
 
 COPYRIGHT
 ---------
 
 COPYRIGHT
 ---------

-Copyright (c) 2006-2009 Jonas Fonseca <fonseca@diku.dk>
+Copyright (c) 2006-2010 Jonas Fonseca <fonseca@diku.dk>

 
 Licensed under the terms of the GNU General Public License.
 
 
 Licensed under the terms of the GNU General Public License.