path: root/Documentation
diff options
authorLinus Torvalds <>2006-02-28 23:07:20 (GMT)
committerJunio C Hamano <>2006-03-01 09:45:50 (GMT)
commit765ac8ec469f110e88376e4fac05d0ed475bcb28 (patch)
tree151dd9135fb335aeffc4b0e4406c8c4cf8b27e2c /Documentation
parent70b006b9712b57741ec1320b15aef2f8b1d6a905 (diff)
Rip out merge-order and make "git log <paths>..." work again.
Well, assuming breaking --merge-order is fine, here's a patch (on top of the other ones) that makes git log <filename> actually work, as far as I can tell. I didn't add the logic for --before/--after flags, but that should be pretty trivial, and is independent of this anyway. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation')
1 files changed, 1 insertions, 48 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 1c6146c..5b306d6 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -16,7 +16,7 @@ SYNOPSIS
[ \--no-merges ]
[ \--remove-empty ]
[ \--all ]
- [ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] ]
+ [ \--topo-order ]
[ \--parents ]
[ \--objects [ \--unpacked ] ]
[ \--pretty | \--header ]
@@ -94,57 +94,10 @@ OPTIONS
topological order (i.e. descendant commits are shown
before their parents).
- 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
-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.
- 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.
Written by Linus Torvalds <>
-Original *--merge-order* logic by Jon Seymour <>
Documentation by David Greaves, Junio C Hamano and the git-list <>.