aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-23 12:52:54 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-23 12:52:55 -0700
commitba8e6326f16748d67fbeda65ffde4729760c64f0 (patch)
treecfd553f836c093db7d9f495127d972c688a398b0 /.gitignore
parent58bbace89d3e94a20faae4df0d20d57574dff6e1 (diff)
parent7365c95d2d67cbbb74c2040918d2ecde06231d93 (diff)
downloadgit-ba8e6326f16748d67fbeda65ffde4729760c64f0.tar.gz
git-ba8e6326f16748d67fbeda65ffde4729760c64f0.tar.xz
Merge branch 'rs/commit-list-sort-in-batch'
Setting up a revision traversal with many starting points was inefficient as these were placed in a date-order priority queue one-by-one. By René Scharfe (3) and Junio C Hamano (1) * rs/commit-list-sort-in-batch: mergesort: rename it to llist_mergesort() revision: insert unsorted, then sort in prepare_revision_walk() commit: use mergesort() in commit_list_sort_by_date() add mergesort() for linked lists
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5a0782fe8..83a5c9df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,6 +181,7 @@
/test-index-version
/test-line-buffer
/test-match-trees
+/test-mergesort
/test-mktemp
/test-parse-options
/test-path-utils