From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Aug 2011 19:35:51 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.7-rc1~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4b5eac7f03f411f75087e0b6db23caa999624304?hp=-c

Merge branch 'maint'

* maint:
Documentation: clarify effects of -- <path> arguments
---

4b5eac7f03f411f75087e0b6db23caa999624304
diff --combined Documentation/git-log.txt
index 6c934660d7,771a3565bd..249fc878ec
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@@ -69,10 -69,13 +69,13 @@@ produced by --stat etc
  	its size is not included.
  
  [\--] <path>...::
- 	Show only commits that affect any of the specified paths. To
- 	prevent confusion with options and branch names, paths may need
- 	to be prefixed with "\-- " to separate them from options or
- 	refnames.
+ 	Show only commits that are enough to explain how the files
+ 	that match the specified paths came to be.  See "History
+ 	Simplification" below for details and other simplification
+ 	modes.
+ +
+ To prevent confusion with options and branch names, paths may need to
+ be prefixed with "\-- " to separate them from options or refnames.
  
  include::rev-list-options.txt[]
  
@@@ -88,45 -91,45 +91,45 @@@ include::diff-generate-patch.txt[
  
  Examples
  --------
 -git log --no-merges::
 +`git log --no-merges`::
  
  	Show the whole commit history, but skip any merges
  
 -git log v2.6.12.. include/scsi drivers/scsi::
 +`git log v2.6.12.. include/scsi drivers/scsi`::
  
  	Show all commits since version 'v2.6.12' that changed any file
  	in the include/scsi or drivers/scsi subdirectories
  
 -git log --since="2 weeks ago" \-- gitk::
 +`git log --since="2 weeks ago" \-- gitk`::
  
  	Show the changes during the last two weeks to the file 'gitk'.
  	The "--" is necessary to avoid confusion with the *branch* named
  	'gitk'
  
 -git log --name-status release..test::
 +`git log --name-status release..test`::
  
  	Show the commits that are in the "test" branch but not yet
  	in the "release" branch, along with the list of paths
  	each commit modifies.
  
 -git log --follow builtin-rev-list.c::
 +`git log --follow builtin-rev-list.c`::
  
  	Shows the commits that changed builtin-rev-list.c, including
  	those commits that occurred before the file was given its
  	present name.
  
 -git log --branches --not --remotes=origin::
 +`git log --branches --not --remotes=origin`::
  
  	Shows all commits that are in any of local branches but not in
  	any of remote-tracking branches for 'origin' (what you have that
  	origin doesn't).
  
 -git log master --not --remotes=*/master::
 +`git log master --not --remotes=*/master`::
  
  	Shows all commits that are in local master but not in any remote
  	repository master branches.
  
 -git log -p -m --first-parent::
 +`git log -p -m --first-parent`::
  
  	Shows the history including change diffs, but only from the
  	"main branch" perspective, skipping commits that come from merged