diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-18 01:24:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-18 01:24:10 -0800 |
| commit | 62a4417b574ce5120882016fd7803b9bccf68a67 (patch) | |
| tree | 62f18b3790e16f0be4d822822a48aa808d7f41b8 /rev-list.c | |
| parent | 8fa40aa915964f0df281106221b10fbe664b4fa9 (diff) | |
| parent | 4c8725f16abff4be4812d0d07a663250bef3ef0e (diff) | |
| download | git-62a4417b574ce5120882016fd7803b9bccf68a67.tar.gz | |
Merge branch 'jc/topo'
* jc/topo:
topo-order: make --date-order optional.
Diffstat (limited to 'rev-list.c')
| -rw-r--r-- | rev-list.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c index 63391fc113..f2d1105cae 100644 --- a/rev-list.c +++ b/rev-list.c @@ -27,6 +27,7 @@ static const char rev_list_usage[] = " ordering output:\n" " --merge-order [ --show-breaks ]\n" " --topo-order\n" +" --date-order\n" " formatting output:\n" " --parents\n" " --objects\n" @@ -56,6 +57,7 @@ static int merge_order = 0; static int show_breaks = 0; static int stop_traversal = 0; static int topo_order = 0; +static int lifo = 1; static int no_merges = 0; static const char **paths = NULL; static int remove_empty_trees = 0; @@ -856,6 +858,13 @@ int main(int argc, const char **argv) } if (!strcmp(arg, "--topo-order")) { topo_order = 1; + lifo = 1; + limited = 1; + continue; + } + if (!strcmp(arg, "--date-order")) { + topo_order = 1; + lifo = 0; limited = 1; continue; } @@ -940,7 +949,7 @@ int main(int argc, const char **argv) if (limited) list = limit_list(list); if (topo_order) - sort_in_topological_order(&list); + sort_in_topological_order(&list, lifo); show_commit_list(list); } else { #ifndef NO_OPENSSL |