diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-04 13:21:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-04 13:21:17 -0800 |
| commit | 21dbe12c76e43735dc623067c1b09ef43519d9fc (patch) | |
| tree | 921e8d74970aba64d3f1c40815aa19d24383ebdc /rev-parse.c | |
| parent | ed19f367220a50e4e2a5c1a00b03c14eafcaba89 (diff) | |
| parent | 64bc6e3db54ef9e2accfdb8e6c8168f789946fcb (diff) | |
| download | git-21dbe12c76e43735dc623067c1b09ef43519d9fc.tar.gz | |
Merge branch 'lt/rev-list'
* lt/rev-list:
setup_revisions(): handle -n<n> and -<n> internally.
git-log (internal): more options.
git-log (internal): add approxidate.
Rip out merge-order and make "git log <paths>..." work again.
Tie it all together: "git log"
Introduce trivial new pager.c helper infrastructure
git-rev-list libification: rev-list walking
Splitting rev-list into revisions lib, end of beginning.
rev-list split: minimum fixup.
First cut at libifying revlist generation
Diffstat (limited to 'rev-parse.c')
| -rw-r--r-- | rev-parse.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/rev-parse.c b/rev-parse.c index 610eacb35a..f90e999e60 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -39,14 +39,12 @@ static int is_rev_argument(const char *arg) "--header", "--max-age=", "--max-count=", - "--merge-order", "--min-age=", "--no-merges", "--objects", "--objects-edge", "--parents", "--pretty", - "--show-breaks", "--sparse", "--topo-order", "--date-order", |