Document rev-list's option --merge

[git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index d00cc3ea5219f73aac79709e683e135548555fd3..bcf187a11cfaf754ecb93a2210139dd88f6a9d32 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -8,7 +8,8 @@ git - the stupid content tracker
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ARGS]
+'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate]
+       [--bare] [--git-dir=GIT_DIR] [--help] COMMAND [ARGS]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -41,6 +42,15 @@ OPTIONS
        environment variable. If no path is given 'git' will print
        the current setting and then exit.
 
        environment variable. If no path is given 'git' will print
        the current setting and then exit.
 

+-p|--paginate::
+       Pipe all output into 'less' (or if set, $PAGER).
+
+--git-dir=<path>::
+       Set the path to the repository. This can also be controlled by
+       setting the GIT_DIR environment variable.
+
+--bare::
+       Same as --git-dir=`pwd`.

 
 FURTHER DOCUMENTATION
 ---------------------
 
 FURTHER DOCUMENTATION
 ---------------------


@@ -387,6 +397,9 @@ gitlink:git-quiltimport[1]::
 gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
 
 gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
 

+gitlink:git-svn[1]::
+       Bidirectional operation between a single Subversion branch and git.
+

 gitlink:git-svnimport[1]::
        Import a SVN repository into git.
 
 gitlink:git-svnimport[1]::
        Import a SVN repository into git.
 


@@ -432,6 +445,9 @@ gitlink:git-get-tar-commit-id[1]::
 gitlink:git-imap-send[1]::
        Dump a mailbox from stdin into an imap folder.
 
 gitlink:git-imap-send[1]::
        Dump a mailbox from stdin into an imap folder.
 

+gitlink:git-instaweb[1]::
+       Instantly browse your working repository in gitweb.
+

 gitlink:git-mailinfo[1]::
        Extracts patch and authorship information from a single
        e-mail message, optionally transliterating the commit
 gitlink:git-mailinfo[1]::
        Extracts patch and authorship information from a single
        e-mail message, optionally transliterating the commit


@@ -615,6 +631,13 @@ git Diffs
        gitlink:git-diff-files[1];
        gitlink:git-diff-tree[1]
 
        gitlink:git-diff-files[1];
        gitlink:git-diff-tree[1]
 

+other
+~~~~~
+'GIT_TRACE'::
+       If this variable is set git will print `trace:` messages on
+       stderr telling about alias expansion, built-in command
+       execution and external command execution.
+

 Discussion[[Discussion]]
 ------------------------
 include::README[]
 Discussion[[Discussion]]
 ------------------------
 include::README[]