summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/cached-commit-buffer' into HEADJunio C Hamano2018-03-136-46/+31
|\
| * revision: drop --show-all optionjk/cached-commit-bufferJeff King2018-02-223-42/+0
| * commit: drop uses of get_cached_commit_buffer()Jeff King2018-02-222-4/+1
| * Git 2.16.2v2.16.2Junio C Hamano2018-02-153-2/+32
| * Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maintJunio C Hamano2018-02-151-3/+4
| |\
| * \ Merge branch 'as/read-tree-prefix-doc-fix' into maintJunio C Hamano2018-02-151-3/+2
| |\ \
| * \ \ Merge branch 'nd/add-i-ignore-submodules' into maintJunio C Hamano2018-02-152-1/+49
| |\ \ \
| * \ \ \ Merge branch 'tg/stash-with-pathspec-fix' into maintJunio C Hamano2018-02-152-3/+34
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2018-02-152-33/+98
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano2018-02-152-4/+45
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/lose-leak-pending' into maintJunio C Hamano2018-02-1510-86/+46
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jm/svn-pushmergeinfo-fix' into maintJunio C Hamano2018-02-151-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dk/describe-all-output-fix' into maintJunio C Hamano2018-02-152-3/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ab/perf-grep-threads' into maintJunio C Hamano2018-02-152-21/+86
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/binsearch-with-fanout' into HEADJunio C Hamano2018-03-133-25/+54
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | packfile: refactor hash search with fanout tablejt/binsearch-with-fanoutJonathan Tan2018-02-153-14/+54
| * | | | | | | | | | | | packfile: remove GIT_DEBUG_LOOKUP log statementsJonathan Tan2018-02-151-11/+0
* | | | | | | | | | | | | Merge branch 'bc/hash-algo'Junio C Hamano2018-02-1515-344/+348
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | hash: update obsolete reference to SHA1_HEADERbc/hash-algobrian m. carlson2018-02-091-2/+2
| * | | | | | | | | | | | | bulk-checkin: abstract SHA-1 usagebrian m. carlson2018-02-021-6/+6
| * | | | | | | | | | | | | csum-file: abstract uses of SHA-1brian m. carlson2018-02-022-7/+7
| * | | | | | | | | | | | | csum-file: rename sha1file to hashfilebrian m. carlson2018-02-029-126/+126
| * | | | | | | | | | | | | read-cache: abstract away uses of SHA-1brian m. carlson2018-02-021-29/+29
| * | | | | | | | | | | | | pack-write: switch various SHA-1 values to abstract formsbrian m. carlson2018-02-021-24/+25
| * | | | | | | | | | | | | pack-check: convert various uses of SHA-1 to abstract formsbrian m. carlson2018-02-021-16/+16
| * | | | | | | | | | | | | fast-import: switch various uses of SHA-1 to the_hash_algobrian m. carlson2018-02-021-20/+22
| * | | | | | | | | | | | | sha1_file: switch uses of SHA-1 to the_hash_algobrian m. carlson2018-02-021-26/+26
| * | | | | | | | | | | | | builtin/unpack-objects: switch uses of SHA-1 to the_hash_algobrian m. carlson2018-02-021-9/+9
| * | | | | | | | | | | | | builtin/index-pack: improve hash function abstractionbrian m. carlson2018-02-021-45/+45
| * | | | | | | | | | | | | hash: create union for hash context allocationbrian m. carlson2018-02-022-17/+18
| * | | | | | | | | | | | | hash: move SHA-1 macros to hash.hbrian m. carlson2018-02-022-25/+25
* | | | | | | | | | | | | | Merge branch 'nd/ignore-glob-doc-update'Junio C Hamano2018-02-151-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gitignore.txt: elaborate shell glob syntaxnd/ignore-glob-doc-updateDuy Nguyen2018-02-021-6/+5
* | | | | | | | | | | | | | | Merge branch 'tg/reset-hard-show-head-with-pretty'Junio C Hamano2018-02-151-18/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | reset --hard: make use of the pretty machinerytg/reset-hard-show-head-with-prettyThomas Gummerer2018-02-021-18/+10
* | | | | | | | | | | | | | | | Merge branch 'rs/cocci-strbuf-addf-to-addstr'Junio C Hamano2018-02-151-16/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | cocci: simplify check for trivial format stringsrs/cocci-strbuf-addf-to-addstrRené Scharfe2018-02-021-16/+1
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/trace-index-ops'Junio C Hamano2018-02-155-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | trace: measure where the time is spent in the index-heavy operationsnd/trace-index-opsNguyễn Thái Ngọc Duy2018-02-025-0/+18
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'cc/perf-aggregate'Junio C Hamano2018-02-151-11/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | perf/aggregate: sort JSON fields in outputcc/perf-aggregateChristian Couder2018-02-021-1/+1
| * | | | | | | | | | | | | | | | perf/aggregate: add --reponame optionChristian Couder2018-02-021-2/+13
| * | | | | | | | | | | | | | | | perf/aggregate: add --subsection optionChristian Couder2018-02-021-9/+24
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ab/wildmatch-tests'Junio C Hamano2018-02-153-245/+416
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | wildmatch test: mark test as EXPENSIVE_ON_WINDOWSab/wildmatch-testsÆvar Arnfjörð Bjarmason2018-01-301-8/+8
| * | | | | | | | | | | | | | | | test-lib: add an EXPENSIVE_ON_WINDOWS prerequisiteÆvar Arnfjörð Bjarmason2018-01-301-0/+4
| * | | | | | | | | | | | | | | | wildmatch test: create & test files on disk in addition to in-memoryÆvar Arnfjörð Bjarmason2018-01-301-11/+190
| * | | | | | | | | | | | | | | | wildmatch test: perform all tests under all wildmatch() modesÆvar Arnfjörð Bjarmason2018-01-302-252/+228
| * | | | | | | | | | | | | | | | wildmatch test: use test_must_fail, not ! for test-wildmatchÆvar Arnfjörð Bjarmason2018-01-301-3/+3
| * | | | | | | | | | | | | | | | wildmatch test: remove dead fnmatch() test codeÆvar Arnfjörð Bjarmason2018-01-301-178/+178