Google Git
Sign in
googlers / jrn / git / 534f0e0996c0a5a0bea5bae8ae088a80a929932b
commit534f0e0996c0a5a0bea5bae8ae088a80a929932b[log] [tgz]
authorJunio C Hamano <gitster@pobox.com>Mon Jul 01 12:41:22 2013 -0700
committerJunio C Hamano <gitster@pobox.com>Mon Jul 01 12:41:23 2013 -0700
tree734ca0d418edf3e0443f3c4e4d751d5cbfa8be05
parent55f34c8d39dac8a90d4944a77cb7614256c62018 [diff]
parentaff2e7c0677d882690213d7ddea4a868f8b18325 [diff]
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
tree: 734ca0d418edf3e0443f3c4e4d751d5cbfa8be05
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. git-gui/
  7. git_remote_helpers/
  8. gitk-git/
  9. gitweb/
  10. mergetools/
  11. perl/
  12. po/
  13. ppc/
  14. t/
  15. templates/
  16. vcs-svn/
  17. xdiff/
  18. RelNotes ⇨ Documentation/RelNotes/1.8.4.txt
  19. .gitattributes
  20. .gitignore
  21. .mailmap
  22. abspath.c
  23. aclocal.m4
  24. advice.c
  25. advice.h
  26. alias.c
  27. alloc.c
  28. archive-tar.c
  29. archive-zip.c
  30. archive.c
  31. archive.h
  32. argv-array.c
  33. argv-array.h
  34. attr.c
  35. attr.h
  36. base85.c
  37. bisect.c
  38. bisect.h
  39. blob.c
  40. blob.h
  41. branch.c
  42. branch.h
  43. builtin.h
  44. bulk-checkin.c
  45. bulk-checkin.h
  46. bundle.c
  47. bundle.h
  48. cache-tree.c
  49. cache-tree.h
  50. cache.h
  51. check-builtins.sh
  52. check-racy.c
  53. check_bindir
  54. color.c
  55. color.h
  56. column.c
  57. column.h
  58. combine-diff.c
  59. command-list.txt
  60. commit-slab.h
  61. commit.c
  62. commit.h
  63. config.c
  64. config.mak.in
  65. config.mak.uname
  66. configure.ac
  67. connect.c
  68. connected.c
  69. connected.h
  70. convert.c
  71. convert.h
  72. copy.c
  73. COPYING
  74. credential-cache--daemon.c
  75. credential-cache.c
  76. credential-store.c
  77. credential.c
  78. credential.h
  79. csum-file.c
  80. csum-file.h
  81. ctype.c
  82. daemon.c
  83. date.c
  84. decorate.c
  85. decorate.h
  86. delta.h
  87. diff-delta.c
  88. diff-lib.c
  89. diff-no-index.c
  90. diff.c
  91. diff.h
  92. diffcore-break.c
  93. diffcore-delta.c
  94. diffcore-order.c
  95. diffcore-pickaxe.c
  96. diffcore-rename.c
  97. diffcore.h
  98. dir.c
  99. dir.h
  100. editor.c
  101. entry.c
  102. environment.c
  103. exec_cmd.c
  104. exec_cmd.h
  105. fast-import.c
  106. fetch-pack.c
  107. fetch-pack.h
  108. fixup-builtins
  109. fmt-merge-msg.h
  110. fsck.c
  111. fsck.h
  112. generate-cmdlist.sh
  113. gettext.c
  114. gettext.h
  115. git-add--interactive.perl
  116. git-am.sh
  117. git-archimport.perl
  118. git-bisect.sh
  119. git-compat-util.h
  120. git-cvsexportcommit.perl
  121. git-cvsimport.perl
  122. git-cvsserver.perl
  123. git-difftool--helper.sh
  124. git-difftool.perl
  125. git-filter-branch.sh
  126. git-instaweb.sh
  127. git-lost-found.sh
  128. git-merge-octopus.sh
  129. git-merge-one-file.sh
  130. git-merge-resolve.sh
  131. git-mergetool--lib.sh
  132. git-mergetool.sh
  133. git-p4.py
  134. git-parse-remote.sh
  135. git-pull.sh
  136. git-quiltimport.sh
  137. git-rebase--am.sh
  138. git-rebase--interactive.sh
  139. git-rebase--merge.sh
  140. git-rebase.sh
  141. git-relink.perl
  142. git-remote-testgit.sh
  143. git-remote-testpy.py
  144. git-repack.sh
  145. git-request-pull.sh
  146. git-send-email.perl
  147. git-sh-i18n.sh
  148. git-sh-setup.sh
  149. git-stash.sh
  150. git-submodule.sh
  151. git-svn.perl
  152. GIT-VERSION-GEN
  153. git-web--browse.sh
  154. git.c
  155. git.rc
  156. git.spec.in
  157. gpg-interface.c
  158. gpg-interface.h
  159. graph.c
  160. graph.h
  161. grep.c
  162. grep.h
  163. hash.c
  164. hash.h
  165. help.c
  166. help.h
  167. hex.c
  168. http-backend.c
  169. http-fetch.c
  170. http-push.c
  171. http-walker.c
  172. http.c
  173. http.h
  174. ident.c
  175. imap-send.c
  176. INSTALL
  177. kwset.c
  178. kwset.h
  179. levenshtein.c
  180. levenshtein.h
  181. LGPL-2.1
  182. line-log.c
  183. line-log.h
  184. line-range.c
  185. line-range.h
  186. list-objects.c
  187. list-objects.h
  188. ll-merge.c
  189. ll-merge.h
  190. lockfile.c
  191. log-tree.c
  192. log-tree.h
  193. mailmap.c
  194. mailmap.h
  195. Makefile
  196. match-trees.c
  197. merge-blobs.c
  198. merge-blobs.h
  199. merge-recursive.c
  200. merge-recursive.h
  201. merge.c
  202. mergesort.c
  203. mergesort.h
  204. name-hash.c
  205. notes-cache.c
  206. notes-cache.h
  207. notes-merge.c
  208. notes-merge.h
  209. notes-utils.c
  210. notes-utils.h
  211. notes.c
  212. notes.h
  213. object.c
  214. object.h
  215. pack-check.c
  216. pack-revindex.c
  217. pack-revindex.h
  218. pack-write.c
  219. pack.h
  220. pager.c
  221. parse-options-cb.c
  222. parse-options.c
  223. parse-options.h
  224. patch-delta.c
  225. patch-ids.c
  226. patch-ids.h
  227. path.c
  228. pathspec.c
  229. pathspec.h
  230. pkt-line.c
  231. pkt-line.h
  232. preload-index.c
  233. pretty.c
  234. prio-queue.c
  235. prio-queue.h
  236. progress.c
  237. progress.h
  238. prompt.c
  239. prompt.h
  240. quote.c
  241. quote.h
  242. reachable.c
  243. reachable.h
  244. read-cache.c
  245. README
  246. reflog-walk.c
  247. reflog-walk.h
  248. refs.c
  249. refs.h
  250. remote-curl.c
  251. remote-testsvn.c
  252. remote.c
  253. remote.h
  254. replace_object.c
  255. rerere.c
  256. rerere.h
  257. resolve-undo.c
  258. resolve-undo.h
  259. revision.c
  260. revision.h
  261. run-command.c
  262. run-command.h
  263. send-pack.c
  264. send-pack.h
  265. sequencer.c
  266. sequencer.h
  267. server-info.c
  268. setup.c
  269. sh-i18n--envsubst.c
  270. sha1-array.c
  271. sha1-array.h
  272. sha1-lookup.c
  273. sha1-lookup.h
  274. sha1_file.c
  275. sha1_name.c
  276. shallow.c
  277. shell.c
  278. shortlog.h
  279. show-index.c
  280. sideband.c
  281. sideband.h
  282. sigchain.c
  283. sigchain.h
  284. strbuf.c
  285. strbuf.h
  286. streaming.c
  287. streaming.h
  288. string-list.c
  289. string-list.h
  290. submodule.c
  291. submodule.h
  292. symlinks.c
  293. tag.c
  294. tag.h
  295. tar.h
  296. test-chmtime.c
  297. test-ctype.c
  298. test-date.c
  299. test-delta.c
  300. test-dump-cache-tree.c
  301. test-genrandom.c
  302. test-index-version.c
  303. test-line-buffer.c
  304. test-match-trees.c
  305. test-mergesort.c
  306. test-mktemp.c
  307. test-parse-options.c
  308. test-path-utils.c
  309. test-prio-queue.c
  310. test-read-cache.c
  311. test-regex.c
  312. test-revision-walking.c
  313. test-run-command.c
  314. test-scrap-cache-tree.c
  315. test-sha1.c
  316. test-sha1.sh
  317. test-sigchain.c
  318. test-string-list.c
  319. test-subprocess.c
  320. test-svn-fe.c
  321. test-wildmatch.c
  322. thread-utils.c
  323. thread-utils.h
  324. trace.c
  325. transport-helper.c
  326. transport.c
  327. transport.h
  328. tree-diff.c
  329. tree-walk.c
  330. tree-walk.h
  331. tree.c
  332. tree.h
  333. unimplemented.sh
  334. unix-socket.c
  335. unix-socket.h
  336. unpack-trees.c
  337. unpack-trees.h
  338. upload-pack.c
  339. url.c
  340. url.h
  341. usage.c
  342. userdiff.c
  343. userdiff.h
  344. utf8.c
  345. utf8.h
  346. varint.c
  347. varint.h
  348. version.c
  349. version.h
  350. walker.c
  351. walker.h
  352. wildmatch.c
  353. wildmatch.h
  354. wrap-for-bin.sh
  355. wrapper.c
  356. write_or_die.c
  357. ws.c
  358. wt-status.c
  359. wt-status.h
  360. xdiff-interface.c
  361. xdiff-interface.h
  362. zlib.c