From c3c24b0b819eb1bf56822c53752d6bddcda9d236 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Tue, 5 Feb 2008 13:50:51 +0100 Subject: [PATCH] Update manpages to not contain contain so many formatting workarounds ... like indentation. However, the '.git/config' thing no longer works. --- tig.1.txt | 22 ++++++++++++------ tigrc.5.txt | 64 ++++++++++++++++++++++++++--------------------------- 2 files changed, 47 insertions(+), 39 deletions(-) diff --git a/tig.1.txt b/tig.1.txt index 778be9b..30508ea 100644 --- a/tig.1.txt +++ b/tig.1.txt @@ -1,4 +1,4 @@ -TIG(1) +tig(1) ====== NAME @@ -55,8 +55,10 @@ OPTIONS \--:: End of tig(1) options. Useful when specifying command options for the main view. Example: - - $ tig -- --since=1.month ++ +---------------------------------------------------------------------------- +$ tig -- --since=1.month +----------------------------------------------------------------------------- log:: Open log view using the given git log options. @@ -73,8 +75,10 @@ show:: encountered. All options including this one will be passed to git log when loading the main view. This makes it possible to say: - - $ tig tag-1.0..HEAD ++ +----------------------------------------------------------------------------- +$ tig tag-1.0..HEAD +----------------------------------------------------------------------------- EXAMPLES -------- @@ -111,6 +115,10 @@ $ tig -- --after "2004-01-01" --before="2006-05-16" -- README ENVIRONMENT VARIABLES --------------------- + +In addition to environment variables used by git (e.g. GIT_DIR), tig defines +the following: + TIG_LS_REMOTE:: Set command for retrieving all repository references. The command should output data in the same format as git-ls-remote(1). @@ -145,9 +153,9 @@ FILES '~/.tigrc':: User configuration file. See gitlink:tigrc[5] for examples. -'.git/config':: +'$GIT_DIR/config':: Repository config file. Read on start-up with the help of - git-repo-config(1). + git-config(1). include::BUGS[] diff --git a/tigrc.5.txt b/tigrc.5.txt index f62a007..5b2843e 100644 --- a/tigrc.5.txt +++ b/tigrc.5.txt @@ -10,9 +10,9 @@ SYNOPSIS -------- [verse] ............................................................................. -*set* variable *=* value -*bind* keymap key action -*color* area fgcolor bgcolor [attributes] +*set* 'variable' *=* 'value' +*bind* 'keymap' 'key' 'action' +*color* 'area' 'fgcolor' 'bgcolor' '[attributes]' ............................................................................. @@ -36,16 +36,16 @@ is: [verse] .............................................................................. - *set* variables *=* value +*set* variables *=* value .............................................................................. 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 per tab - set encoding = "UTF-8" # Commit encoding +set show-rev-graph = yes # Show revision graph? +set line-number-interval = 5 # Interval between line numbers +set tab-size = 8 # Number of spaces per tab +set encoding = "UTF-8" # Commit encoding -------------------------------------------------------------------------- The type of variables are either bool, int, and string. @@ -97,25 +97,25 @@ key map. The syntax is: [verse] .............................................................................. - *bind* 'keymap' 'key' 'action' +*bind* 'keymap' 'key' 'action' .............................................................................. Examples: -------------------------------------------------------------------------- - # A few keybindings - bind main w scroll-line-up - bind main s scroll-line-down - bind main space enter - bind diff a previous - bind diff d next - 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) +# A few keybindings +bind main w scroll-line-up +bind main s scroll-line-down +bind main space enter +bind diff a previous +bind diff d next +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 @@ -261,21 +261,21 @@ as the last parameter. The syntax is: [verse] .............................................................................. - *color* 'area' 'fgcolor' 'bgcolor' '[attributes]' +*color* 'area' 'fgcolor' 'bgcolor' '[attributes]' .............................................................................. Examples: ------------------------------------------------------------------------------ - # Diff colors - color diff-header yellow default - color diff-index blue default - color diff-chunk magenta default - # A strange looking cursor line - color cursor red default underline - # UI colors - color title-blur white blue - color title-focus white blue bold +# Diff colors +color diff-header yellow default +color diff-index blue default +color diff-chunk magenta default +# A strange looking cursor line +color cursor red default underline +# UI colors +color title-blur white blue +color title-focus white blue bold ------------------------------------------------------------------------------ Area names:: -- 2.32.0.93.g670b81a890