X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=show-branch.c;h=5a86ae2f9ed3159d082158c04bea51c39cb4477f;hb=7c3ecb65eec9ff2c39c781958bf50ed6541e1332;hp=511fd3b656ec0f66492994c21bb024a52f482a78;hpb=4dc870d90cf4cd30b30b59054603fbb09dca1f41;p=git.git diff --git a/show-branch.c b/show-branch.c index 511fd3b6..5a86ae2f 100644 --- a/show-branch.c +++ b/show-branch.c @@ -535,6 +535,7 @@ int main(int ac, char **av) int num_rev, i, extra = 0; int all_heads = 0, all_tags = 0; int all_mask, all_revs; + int lifo = 1; char head_path[128]; const char *head_path_p; int head_path_len; @@ -544,7 +545,6 @@ int main(int ac, char **av) int no_name = 0; int sha1_name = 0; int shown_merge_point = 0; - int topo_order = 0; int with_current_branch = 0; int head_at = -1; @@ -586,7 +586,9 @@ int main(int ac, char **av) else if (!strcmp(arg, "--independent")) independent = 1; else if (!strcmp(arg, "--topo-order")) - topo_order = 1; + lifo = 1; + else if (!strcmp(arg, "--date-order")) + lifo = 0; else usage(show_branch_usage); ac--; av++; @@ -710,8 +712,7 @@ int main(int ac, char **av) exit(0); /* Sort topologically */ - if (topo_order) - sort_in_topological_order(&seen); + sort_in_topological_order(&seen, lifo); /* Give names to commits */ if (!sha1_name && !no_name)