From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:07:56 +0000 (-0700)
Subject: Merge branch 'eb/doc-log-manpage'
X-Git-Tag: v1.7.2~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90a0f1b44b387877c0bbe427382a2988d906d968;p=git.git

Merge branch 'eb/doc-log-manpage'

* eb/doc-log-manpage:
  Reorganize `git-log' man page to clarify common diff options.
---

90a0f1b44b387877c0bbe427382a2988d906d968
diff --cc Documentation/git-log.txt
index 8a69647f5,c925d3675..e970664fe
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@@ -34,8 -31,13 +31,12 @@@ OPTION
  	either <since> or <until> is omitted, it defaults to
  	`HEAD`, i.e. the tip of the current branch.
  	For a more complete list of ways to spell <since>
 -	and <until>, see "SPECIFYING REVISIONS" section in
 -	linkgit:git-rev-parse[1].
 +	and <until>, see linkgit:gitrevisions[1].
  
+ --follow::
+ 	Continue listing the history of a file beyond renames
+ 	(works only for a single file).
+ 
  --no-decorate::
  --decorate[=short|full|no]::
  	Print out the ref names of any commits that are shown. If 'short' is