diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:23 -0700 |
| commit | 534f0e0996c0a5a0bea5bae8ae088a80a929932b (patch) | |
| tree | 734ca0d418edf3e0443f3c4e4d751d5cbfa8be05 /.gitignore | |
| parent | 55f34c8d39dac8a90d4944a77cb7614256c62018 (diff) | |
| parent | aff2e7c0677d882690213d7ddea4a868f8b18325 (diff) | |
| download | git-534f0e0996c0a5a0bea5bae8ae088a80a929932b.tar.gz git-534f0e0996c0a5a0bea5bae8ae088a80a929932b.tar.xz | |
Merge branch 'jc/topo-author-date-sort'
"git log" learned the "--author-date-order" option, with which the
output is topologically sorted and commits in parallel histories
are shown intermixed together based on the author timestamp.
* jc/topo-author-date-sort:
t6003: add --author-date-order test
topology tests: teach a helper to set author dates as well
t6003: add --date-order test
topology tests: teach a helper to take abbreviated timestamps
t/lib-t6000: style fixes
log: --author-date-order
sort-in-topological-order: use prio-queue
prio-queue: priority queue of pointers to structs
toposort: rename "lifo" field
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index c0e00eb37..efa8db003 100644 --- a/.gitignore +++ b/.gitignore @@ -191,6 +191,7 @@ /test-mktemp /test-parse-options /test-path-utils +/test-prio-queue /test-read-cache /test-regex /test-revision-walking |