X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/b6607e7e796f5b58d64211c022d3e1af6159bdaa..accccb2b9d89e13e5b86ac7af7160446a65349ab:/tig.1.txt

diff --git a/tig.1.txt b/tig.1.txt
index 7b1c779..ee96a97 100644
--- a/tig.1.txt
+++ b/tig.1.txt
@@ -8,12 +8,11 @@ tig - text-mode interface for git
 SYNOPSIS
 --------
 [verse]
-tig [options]
-tig [options] [--] [git options]
-tig [options] log  [git options]
-tig [options] diff [git options]
-tig [options] show [git options]
-tig [options] <    [git command output]
+tig        [options] [revisions] [--] [paths]
+tig show   [options] [revisions] [--] [paths]
+tig blame  [rev] path
+tig status
+tig <      [git command output]
 
 DESCRIPTION
 -----------
@@ -30,21 +29,22 @@ to colorize it.
 OPTIONS
 -------
 
--l::
-	Start up in log view using the internal log command.
+Command line options recognized by tig include all valid git-log(1) and
+git-diff(1) options, as well as the following subcommands and tig specific
+options. The first command line parameter not starting with "-" is interpreted
+as being either a revision specification or a path and will end the option
+parsing. All following options will be passed untouched to the underlying git
+command.
 
--d::
-	Start up in diff view using the internal diff command.
-
--S::
-	Start up in status view.
+show::
+	Open diff view using the given git show options.
 
--n[INTERVAL], --line-number[=INTERVAL]::
-	Prefix line numbers in log and diff view.
-	Optionally, with interval different than each line.
+blame::
+	Show given file annotated or blamed by commits.
+	Optionally limited from given revision.
 
--b[NSPACES], --tab-size[=NSPACES]::
-	Set the number of spaces tabs should be expanded to.
+status::
+	Start up in status view.
 
 -v, --version::
 	Show version and exit.
@@ -52,34 +52,6 @@ OPTIONS
 -h, --help::
 	Show help message and exit.
 
-\--::
-	End of tig(1) options. Useful when specifying command
-	options for the main view. Example:
-+
-----------------------------------------------------------------------------
-$ tig -- --since=1.month
------------------------------------------------------------------------------
-
-log::
-	Open log view using the given git log options.
-
-diff::
-	Open diff view using the given git diff options.
-
-show::
-	Open diff view using the given git show options.
-
-[git options]::
-	tig(1) will stop the option parsing when the first
-	command line parameter not starting with "-" is
-	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
------------------------------------------------------------------------------
-
 EXAMPLES
 --------
 
@@ -95,7 +67,7 @@ $ tig test master
 
 Display all branches:
 -----------------------------------------------------------------------------
-$ tig -- --all
+$ tig --all
 -----------------------------------------------------------------------------
 
 Display differences between two branches:
@@ -108,9 +80,14 @@ Display changes for a single file:
 $ tig -- README
 -----------------------------------------------------------------------------
 
+Display contents of the README file in a specific revision:
+-----------------------------------------------------------------------------
+$ tig show tig-0.8:README
+-----------------------------------------------------------------------------
+
 Display revisions between two dates for a specific file:
 -----------------------------------------------------------------------------
-$ tig -- --after "2004-01-01" --before="2006-05-16" -- README
+$ tig --after="2004-01-01" --before="2006-05-16" -- README
 -----------------------------------------------------------------------------
 
 ENVIRONMENT VARIABLES
@@ -171,7 +148,7 @@ include::BUGS[]
 
 COPYRIGHT
 ---------
-Copyright (c) 2006-2007 Jonas Fonseca <fonseca@diku.dk>
+Copyright (c) 2006-2008 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