summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/commit-buffer-length' into maintJunio C Hamano2014-07-1627-197/+284
|\
| * reuse cached commit buffer when parsing signaturesjk/commit-buffer-lengthJeff King2014-06-133-19/+12
| * commit: record buffer length in cacheJeff King2014-06-1316-38/+68
| * commit: convert commit->buffer to a slabJeff King2014-06-132-8/+13
| * commit-slab: provide a static initializerJeff King2014-06-131-0/+12
| * use get_commit_buffer everywhereJeff King2014-06-137-9/+33
| * convert logmsg_reencode to get_commit_bufferJeff King2014-06-136-35/+16
| * use get_commit_buffer to avoid duplicate codeJeff King2014-06-132-27/+7
| * use get_cached_commit_buffer where appropriateJeff King2014-06-133-3/+3
| * provide helpers to access the commit bufferJeff King2014-06-132-0/+49
| * provide a helper to set the commit bufferJeff King2014-06-134-3/+14
| * provide a helper to free commit bufferJeff King2014-06-136-9/+30
| * sequencer: use logmsg_reencode in get_messageJeff King2014-06-121-40/+5
| * logmsg_reencode: return const bufferJeff King2014-06-125-16/+23
| * do not create "struct commit" with xcallocJeff King2014-06-122-2/+2
| * commit: push commit_index update into alloc_commit_nodeJeff King2014-06-122-4/+10
| * alloc: include any-object allocations in alloc_reportJeff King2014-06-121-6/+7
| * replace dangerous uses of strbuf_attachJeff King2014-06-122-8/+3
| * commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-129-22/+29
* | Merge branch 'bc/fix-rebase-merge-skip' into maintJunio C Hamano2014-07-162-2/+18
|\ \
| * | rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skipbrian m. carlson2014-06-162-2/+18
* | | Merge branch 'maint-1.9' into maintJunio C Hamano2014-07-161-7/+5
|\ \ \
| * \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-164-11/+9
| |\ \ \ | | |/ / | |/| |
| | * | annotate: use argv_arrayRené Scharfe2014-07-161-7/+5
* | | | Start preparing for 2.0.2Junio C Hamano2014-07-102-1/+14
* | | | Merge branch 'pb/trim-trailing-spaces' into maintJunio C Hamano2014-07-102-15/+44
|\ \ \ \
| * | | | t0008: do not depend on 'echo' handling backslashes speciallypb/trim-trailing-spacesJunio C Hamano2014-06-131-6/+8
| * | | | dir.c:trim_trailing_spaces(): fix for " \ " sequencePasha Bolokhov2014-06-022-15/+42
| | |_|/ | |/| |
* | | | Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2014-07-102-7/+27
|\ \ \ \
| * | | | repack: s/write_bitmap/&s/ in codejk/repack-pack-keep-objectsJeff King2014-06-101-6/+6
| * | | | repack: respect pack.writebitmapsJeff King2014-06-102-2/+22
| * | | | repack: do not accidentally pack kept objects by defaultJeff King2014-06-102-2/+2
* | | | | Merge branch 'mc/doc-submodule-sync-recurse' into maintJunio C Hamano2014-07-101-1/+1
|\ \ \ \ \
| * | | | | submodule: document "sync --recursive"mc/doc-submodule-sync-recurseMatthew Chen2014-06-131-1/+1
* | | | | | Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-023-4/+4
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
| * | | | | enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-022-2/+2
| |/ / / /
* | | | | Git 2.0.1v2.0.1Junio C Hamano2014-06-254-3/+119
* | | | | Merge branch 'na/no-http-test-in-the-middle' into maintJunio C Hamano2014-06-252-59/+100
|\ \ \ \ \
| * | | | | t5538: move http push tests out to t5542na/no-http-test-in-the-middleNick Alcock2014-05-302-59/+100
* | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-255-8/+108
|\ \ \ \ \ \
| * | | | | | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-072-3/+17
| * | | | | | status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-074-6/+92
* | | | | | | Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-256-5/+90
|\ \ \ \ \ \ \
| * | | | | | | read-cache.c: verify index file before we opportunistically update itym/fix-opportunistic-index-update-raceYiannis Marangos2014-04-103-1/+69
| * | | | | | | wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-104-4/+21
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maintJunio C Hamano2014-06-254-11/+15
|\ \ \ \ \ \ \
| * | | | | | | git-show: fix 'git show -s' to not add extra terminator after merge commitmk/show-s-no-extra-blank-line-for-mergesMax Kirillov2014-05-154-11/+15
| |/ / / / / /
* | | | | | | Merge branch 'rr/rebase-autostash-fix' into maintJunio C Hamano2014-06-253-3/+27
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fixMatthieu Moy2014-05-201-0/+15
View Lorry Controller Status