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.

diff --cc Documentation/git-rev-list.txt
index 5b306d65933b0878ebc7623ed25a54edc979e95c,27f18e2c50c41710b1b4e0912577e8aa7336e46d..8255ae1bceee562140179704352a7e4f9cd83d99
--- 1/Documentation/git-rev-list.txt
--- 2/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>... ]