From: Junio C Hamano <junkio@cox.net>
Date: Sun, 13 Aug 2006 02:13:25 +0000 (-0700)
Subject: Merge branch 'ml/pager'
X-Git-Tag: v1.4.3-rc1~279
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/71c87795c3f724a88c2f1f95aa21f212efc69b66?hp=-c

Merge branch 'ml/pager'
---

71c87795c3f724a88c2f1f95aa21f212efc69b66
diff --combined Documentation/git.txt
index bcf187a11c,d24388368e..3de5fa9c82
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -397,9 -397,6 +397,9 @@@ gitlink:git-quiltimport[1]:
  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.
  
@@@ -445,9 -442,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-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
@@@ -633,6 -627,9 +633,9 @@@ git Diff
  
  other
  ~~~~~
+ 'GIT_PAGER'::
+ 	This environment variable overrides `$PAGER`.
+ 
  'GIT_TRACE'::
  	If this variable is set git will print `trace:` messages on
  	stderr telling about alias expansion, built-in command