X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tig/blobdiff_plain/2b9c2ad0cb752490823c2e0ac11a70547103cda3..refs/heads/release:/tig.1.html diff --git a/tig.1.html b/tig.1.html index 9d3f59c..ae14630 100644 --- a/tig.1.html +++ b/tig.1.html @@ -274,10 +274,10 @@ TIG(1) Manual Page
@@ -335,6 +335,14 @@ to colorize it.
+ Show help message and exit. +
+@@ -356,7 +364,7 @@ log [git log options]
@@ -364,7 +372,7 @@ diff [git diff options]
@@ -372,7 +380,7 @@ show [git show options]
@@ -388,58 +396,9 @@ show [git show options]
If stdin is a pipe, any log or diff options will be ignored and the -pager view will be opened loading data from stdin. The pager mode -can be used for colorizing output from various git commands.
-Example on how to colorize the output of git-show(1):
-$ git show | tig-
All git command options specified on the command line will -be passed to the given command and all will be shell quoted -before they are passed to the shell.
-
- Note
- |
-If you specify options for the main view, you should -not use the --pretty option as this option will be set -automatically to the format expected by the main view. | -
Example on how to open the log view and show both author and -committer information:
-$ tig log --pretty=fuller-
See the "Specifying revisions" section below -for an introduction to revision options supported by the git -commands. For details on specific git command options, refer -to the man page of the command in question.
Several options related to the interface with git can be configured -via environment options.
-Commits that are referenced by tags and branch heads will be marked -by the reference name surrounded by [ and ]:
-2006-03-26 19:42 Petr Baudis | [cogito-0.17.1] Cogito 0.17.1-
If you want to filter out certain directories under .git/refs/, say -tmp you can do it by setting the following variable:
-$ TIG_LS_REMOTE="git ls-remote . | sed /\/tmp\//d" tig-
Or set the variable permanently in your environment.
It is possible to alter which commands are used for the different views. -If for example you prefer commits in the main view to be sorted by date -and only show 500 commits, use:
-$ TIG_MAIN_CMD="git log --date-order -n500 --pretty=raw %s" tig-
Or set the variable permanently in your environment.
-Notice, how %s is used to specify the commit reference. There can -be a maximum of 5 %s ref specifications.
-tig(1) presents various views of a repository. Each view is based on output -from an external command, most often git log, git diff, or git show.
+- Is the default view, and it shows a one line summary of each commit - in the chosen list of revision. The summary includes commit date, - author, and the first line of the log message. Additionally, any - repository references, such as tags, will be shown. + The command used for the tree view. By default, git-ls-tree(1) is + used. The commands should expect first the commit ID and second + a path.
- Presents a more rich view of the revision log showing the whole log - message and the diffstat. -
-- Shows either the diff of the current working tree, that is, what - has changed since the last commit, or the commit diff complete - with log message, diffstat and diff. -
-- Is used for displaying both input from stdin and output from git - commands entered in the internal prompt. -
-- Displays the information from the tig(1) man page. For the help view - to work you need to have the tig(1) man page installed. + The command used for the blob view. By default, git-cat-file(1) is + used. The command gets the blob ID.
Below the default key bindings are shown.
-- Switch to main view. -
-- Switch to diff view. -
-- Switch to log view. -
-- Switch to pager view. -
-- Show man page. -
-- If on a commit line show the commit diff. Additionally, if in - main or log view this will split the view. To open the commit - diff in full size view either use d or press Return twice. + User configuration file. See tigrc(5) for examples.
- Switch to next view. + Repository config file. Read on start-up with the help of + git-repo-config(1).
- Move cursor one line up. -
-- Move cursor one line down. -
-- Move cursor one line up and enter. When used in the main view - this will always show the diff of the current commit in the - split diff view. -
-- Move cursor one line down and enter. -
-- Move cursor one page up. -
-- Move cursor one page down. -
-- Jump to first line. -
-- Jump to last line. -
-- Scroll view one line up. -
-- Scroll view one line down. -
-- Scroll view one page up. -
-- Scroll view one page down. -
-- Quit -
-- Redraw screen. -
-- Stop all background loading. This can be useful if you use - tig(1) in a repository with a long history without limiting - the revision log. -
-- Show version. -
-- Toggle line numbers on/off. -
-- Open prompt. This allows you to specify what git command - to run. Example: -
-:log -p-
This section describes various ways to specify what revisions to display -or otherwise limit the view to. Note, that tig(1) does not itself parse -the described revision options.
-If you are interested only in those revisions that made changes to a -specific file (or even several files) list the files like this:
-$ tig log Makefile-
To avoid ambiguity with repository references such as tag name, be sure -to separate file names from other git options using "--". So if you -have a file named master it will clash with the reference named -master, and thus you will have to use:
-$ tag log -- master-
- Note
- |
-For the main view, avoiding ambiguity will in some cases require -you to specify two "--" options. The first will make tig(1) stop -option processing and the latter will be passed to git log. | -
To speed up interaction with git, you can limit the amount of commits -to show both for the log and main view. Either limit by date using -e.g. --since=1.month or limit by the number of commits using -n400.
-
- Note
- |
-You can tune the interaction with git by making use of the options -explained in this section. For example, by configuring the environment -variables described in the "View commands" section. | -
Alternatively, commits can be limited to a specific range, such as -"all commits between tag-1.0 and tag-2.0". For example:
-$ tig log tag-1.0..tag-2.0-
This way of commit limiting makes it trivial to only browse the commits -which haven't been pushed to a remote branch. Assuming origin is your -upstream remote branch, using:
-$ tig log origin..HEAD-
will list what will be pushed to the remote branch. Optionally, the ending -HEAD can be left out since it is implied.
-Git interprets the range specifier "tag-1.0..tag-2.0" as -"all commits reachable from tag-2.0 but not from tag-1.0". -If you prefer to specify which commit to preview in this way use the -following:
-$ tig log tag-2.0 ^tag-1.0-
You can think of ^ as a negation operator. Using this alternate syntax, -it is possible to further prune commits by specifying multiple branch -cut offs.
-If the screen width is very small the main view can draw -outside the current view causing bad wrapping. Same goes -for title and status windows. -
-Features that should be explored.
--Searching. +Proper locale support: in it's current state tig is pretty much UTF-8 only.
-Locale support. +Horizontal scrolling.
Copyright (c) Jonas Fonseca <fonseca@diku.dk>, 2006
+Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -890,15 +510,41 @@ the Free Software Foundation; either version 2 of the License, or
tigrc(5), git(7), cogito(7), as well as other git repository browsers: +gitk(1), qgit(1), gitview(1).
+Online resources:
++Homepage: http://jonas.nitro.dk/tig +
++Manual: http://jonas.nitro.dk/tig/manual.html +
++Releases: http://jonas.nitro.dk/tig/releases +
++Git URL: http://jonas.nitro.dk/tig/tig.git or + git://repo.or.cz/tig.git +
++Gitweb: http://repo.or.cz/?p=tig.git;a=summary +
+