summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge branch 'jm/instaweb-apache-24' into maintJunio C Hamano2014-07-221-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-2212-21/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/byte-order' into maintJunio C Hamano2014-07-221-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lt/request-pull' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano2014-07-225-5/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Documentation: fix missing text for rev-parse --verifybrian m. carlson2014-07-221-1/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/code-cleaning'Junio C Hamano2014-07-2213-103/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | remote-testsvn: use internal argv_array of struct child_process in cmd_import()rs/code-cleaningRené Scharfe2014-07-181-9/+7
| * | | | | | | | | | | | | | | | | | | | | | bundle: use internal argv_array of struct child_process in create_bundle()René Scharfe2014-07-181-10/+5
| * | | | | | | | | | | | | | | | | | | | | | fast-import: use hashcmp() for SHA1 hash comparisonRené Scharfe2014-07-181-1/+1
| * | | | | | | | | | | | | | | | | | | | | | transport: simplify fetch_objs_via_rsync() using argv_arrayRené Scharfe2014-07-181-20/+8
| * | | | | | | | | | | | | | | | | | | | | | run-command: use internal argv_array of struct child_process in run_hook_ve()René Scharfe2014-07-171-11/+4
| * | | | | | | | | | | | | | | | | | | | | | use commit_list_count() to count the members of commit_listsRené Scharfe2014-07-175-42/+6
| * | | | | | | | | | | | | | | | | | | | | | strbuf: use strbuf_addstr() for adding C stringsRené Scharfe2014-07-173-10/+10
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/path-max-must-go'Junio C Hamano2014-07-222-46/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | prep_exclude: remove the artificial PATH_MAX limitnd/path-max-must-goNguyễn Thái Ngọc Duy2014-07-142-20/+29
| * | | | | | | | | | | | | | | | | | | | | | | dir.h: move struct exclude declaration to top levelNguyễn Thái Ngọc Duy2014-07-141-20/+22
| * | | | | | | | | | | | | | | | | | | | | | | dir.c: coding style fixNguyễn Thái Ngọc Duy2014-07-141-6/+6
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/alloc-commit-id'Junio C Hamano2014-07-2211-89/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | diff-tree: avoid lookup_unknown_objectjk/alloc-commit-idJeff King2014-07-131-3/+1
| * | | | | | | | | | | | | | | | | | | | | | | | object_as_type: set commit indexJeff King2014-07-131-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | alloc: factor out commit indexJeff King2014-07-132-2/+8
| * | | | | | | | | | | | | | | | | | | | | | | | add object_as_type helper for casting objectsJeff King2014-07-137-43/+25
| * | | | | | | | | | | | | | | | | | | | | | | | parse_object_buffer: do not set object typeJeff King2014-07-131-2/+0
| * | | | | | | | | | | | | | | | | | | | | | | | move setting of object->type to alloc_* functionsJeff King2014-07-138-12/+13
| * | | | | | | | | | | | | | | | | | | | | | | | alloc: write out allocator definitionsJeff King2014-07-131-11/+27
| * | | | | | | | | | | | | | | | | | | | | | | | alloc.c: remove the alloc_raw_commit_node() functionRamsay Jones2014-07-131-18/+29
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kb/perf-trace'Junio C Hamano2014-07-2217-176/+629
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | api-trace.txt: add trace API documentationKarsten Blees2014-07-131-0/+97
| * | | | | | | | | | | | | | | | | | | | | | | | | progress: simplify performance measurement by using getnanotime()Karsten Blees2014-07-131-35/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | wt-status: simplify performance measurement by using getnanotime()Karsten Blees2014-07-131-11/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | git: add performance tracing for git's main() function to debug scriptsKarsten Blees2014-07-134-0/+30
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: add trace_performance facility to debug performance issuesKarsten Blees2014-07-132-0/+65
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: add high resolution timer function to debug performance issuesKarsten Blees2014-07-134-0/+91
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: add 'file:line' to all trace outputKarsten Blees2014-07-133-12/+126
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: move code around, in preparation to file:line outputKarsten Blees2014-07-132-22/+26
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: add current timestamp to all trace outputKarsten Blees2014-07-131-1/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: disable additional trace output for unit testsKarsten Blees2014-07-132-0/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: add infrastructure to augment trace output with additional infoKarsten Blees2014-07-132-15/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace APIKarsten Blees2014-07-132-28/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | Documentation/git.txt: improve documentation of 'GIT_TRACE*' variablesKarsten Blees2014-07-131-16/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: improve trace performanceKarsten Blees2014-07-136-59/+78
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: remove redundant printf format attributeKarsten Blees2014-06-171-1/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: consistently name the format parameterKarsten Blees2014-06-172-12/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | trace: move trace declarations from cache.h to new trace.hKarsten Blees2014-06-172-11/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2014-07-2110-27/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-216-19/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | use xcalloc() to allocate zero-initialized memoryRené Scharfe2014-07-214-8/+4