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.lorimer.id.au/gitweb.git/diff_plain/810e300d4c470d8f1861585eb2c79a638df76a22?hp=-c

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 --combined Documentation/git-rev-list.txt
index 5b306d6593,27f18e2c50..8255ae1bce
--- 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>... ]
@@@ -53,6 -53,14 +53,14 @@@ OPTION
  	which I need to download if I have the commit object 'bar', but
  	not 'foo'".
  
+ --objects-edge::
+ 	Similar to `--objects`, but also print the IDs of
+ 	excluded commits refixed with a `-` character.  This is
+ 	used by `git-pack-objects` to build 'thin' pack, which
+ 	records objects in deltified form based on objects
+ 	contained in these excluded commits to reduce network
+ 	traffic.
+ 
  --unpacked::
  	Only useful with `--objects`; print the object IDs that
  	are not in packs.
@@@ -94,10 -102,57 +102,10 @@@
  	topological order (i.e. descendant commits are shown
  	before their parents).
  
 ---merge-order::
 -	When specified the commit history is decomposed into a unique
 -	sequence of minimal, non-linear epochs and maximal, linear epochs.
 -	Non-linear epochs are then linearised by sorting them into merge
 -	order, which is described below.
 -+
 -Maximal, linear epochs correspond to periods of sequential development.
 -Minimal, non-linear epochs correspond to periods of divergent development
 -followed by a converging merge. The theory of epochs is described in more
 -detail at
 -link:http://blackcubes.dyndns.org/epoch/[http://blackcubes.dyndns.org/epoch/].
 -+
 -The merge order for a non-linear epoch is defined as a linearisation for which
 -the following invariants are true:
 -+
 -    1. if a commit P is reachable from commit N, commit P sorts after commit N
 -       in the linearised list.
 -    2. if Pi and Pj are any two parents of a merge M (with i < j), then any
 -       commit N, such that N is reachable from Pj but not reachable from Pi,
 -       sorts before all commits reachable from Pi.
 -+
 -Invariant 1 states that later commits appear before earlier commits they are
 -derived from.
 -+
 -Invariant 2 states that commits unique to "later" parents in a merge, appear
 -before all commits from "earlier" parents of a merge.
 -
 ---show-breaks::
 -	Each item of the list is output with a 2-character prefix consisting
 -	of one of: (|), (^), (=) followed by a space.
 -+
 -Commits marked with (=) represent the boundaries of minimal, non-linear epochs
 -and correspond either to the start of a period of divergent development or to
 -the end of such a period.
 -+
 -Commits marked with (|) are direct parents of commits immediately preceding
 -the marked commit in the list.
 -+
 -Commits marked with (^) are not parents of the immediately preceding commit.
 -These "breaks" represent necessary discontinuities implied by trying to
 -represent an arbitrary DAG in a linear form.
 -+
 -`--show-breaks` is only valid if `--merge-order` is also specified.
 -
 -
  Author
  ------
  Written by Linus Torvalds <torvalds@osdl.org>
  
 -Original *--merge-order* logic by Jon Seymour <jon.seymour@gmail.com>
 -
  Documentation
  --------------
  Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.