From: Junio C Hamano <junkio@cox.net>
Date: Fri, 3 Mar 2006 05:15:26 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~54^2~7
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=810e300d4c470d8f1861585eb2c79a638df76a22;p=git.git

Merge branch 'master' into next

* master:
  Merge branch 'jc/diff'
  git-commit: make sure we protect against races.
  git-commit --amend
  show-branch --topics
  GIT-VERSION-GEN: squelch unneeded error from "cat version"
  Merge branch 'ml/cvsserver'
  annotate: resurrect raw timestamps.
  Documentation: rev-list --objects-edge
  Documentation: read-tree --aggressive
  war on whitespaces: documentation.
---

810e300d4c470d8f1861585eb2c79a638df76a22
diff --cc Documentation/git-rev-list.txt
index 5b306d65,27f18e2c..8255ae1b
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@@ -16,9 -16,9 +16,9 @@@ SYNOPSI
  	     [ \--no-merges ]
  	     [ \--remove-empty ]
  	     [ \--all ]
 -	     [ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] ]
 +	     [ \--topo-order ]
  	     [ \--parents ]
- 	     [ \--objects [ \--unpacked ] ]
+ 	     [ [\--objects | \--objects-edge] [ \--unpacked ] ]
  	     [ \--pretty | \--header ]
  	     [ \--bisect ]
  	     <commit>... [ \-- <paths>... ]