get_author_initials: various fixes

[tig.git] / tigrc.5.txt

diff --git a/tigrc.5.txt b/tigrc.5.txt
index b373ef2595f22819de4c24a3d71fb43f54d45f0c..1464492c17fc4ca293f09811c7e387ea99b1ad04 100644 (file)
--- a/tigrc.5.txt
+++ b/tigrc.5.txt
@@ -49,6 +49,7 @@ set show-line-numbers = no    # Show line numbers?
 set line-number-interval = 5   # Interval between line numbers
 set commit-encoding = "UTF-8"  # Commit encoding
 set horizontal-scroll = 33%    # Scroll 33% of the view width
+set blame-options = -C -C -C   # Blame lines from other files
 --------------------------------------------------------------------------
 
 Or in the git configuration files:
@@ -86,31 +87,22 @@ Variables
 
 The following variables can be set:
 
-'show-rev-graph' (bool)::
-
-       Whether to show revision graph in the main view on start-up.
-       Can be toggled. See also line-graphics options.
-
-'show-refs' (bool)::
-
-       Whether to show references (branches, tags, and remotes) in the main
-       view on start-up. Can be toggled.
-
-'show-author' (mixed) ["abbreviated" | "default" | bool]::
+'author-width' (int)::
 
-       How to display author names. If set to "abbreviated" author initials
-       will be shown. Can be toggled.
+       Width of the author column. When set to 5 or below, the author name
+       will be abbreviated to the author's initials.
 
-'show-date' (mixed) ["relative" | "short" | "default" | "local" | bool]::
+'blame-options' (string)::
 
-       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. If set to "local", localtime(3) is used. Can be toggled.
+       A space separated string of extra blame options. Can be used for
+       telling git-blame(1) how to detect the origin of lines. The value
+       is ignored when tig is started in blame mode and given blame options
+       on the command line.
 
-'author-width' (int)::
+'commit-encoding' (string)::
 
-       Width of the author column. When set to 5 or below, the author name
-       will be abbreviated to the author's initials.
+       The encoding used for commits. The default is UTF-8. Note this option
+       is shadowed by the "i18n.commitencoding" option in `.git/config`.
 
 'line-graphics' (mixed) [ "ascii" | "default" | "utf-8" | bool]::
 
@@ -122,10 +114,6 @@ The following variables can be set:
        numbering with 'n' or the `-n` command line option.  The default is to
        number every line.
 
-'tab-size' (int)::
-
-       Number of spaces per tab. The default is 8 spaces.
-
 'horizontal-scroll' (mixed)::
 
        Interval to scroll horizontally in each step. Can be specified either
@@ -134,6 +122,27 @@ 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.
 
+'show-author' (mixed) ["abbreviated" | "default" | bool]::
+
+       How to display author names. If set to "abbreviated" author initials
+       will be shown. Can be toggled.
+
+'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
+       shown. If set to "local", localtime(3) is used. Can be toggled.
+
+'show-refs' (bool)::
+
+       Whether to show references (branches, tags, and remotes) in the main
+       view on start-up. Can be toggled.
+
+'show-rev-graph' (bool)::
+
+       Whether to show revision graph in the main view on start-up.
+       Can be toggled. See also line-graphics options.
+
 'split-view-height' (mixed)::
 
        Height of the lower view in a split view. Can be specified either as
@@ -142,16 +151,14 @@ The following variables can be set:
        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. Note this option
-       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.
 
+'tab-size' (int)::
+
+       Number of spaces per tab. The default is 8 spaces.
 
 Bind command
 ------------