summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lf/recv-sideband-cleanup' into maintJunio C Hamano2016-08-081-74/+58
|\
| * sideband.c: small optimization of strbuf usagelf/recv-sideband-cleanupNicolas Pitre2016-07-061-3/+3
| * sideband.c: refactor recv_sideband()Lukas Fleischer2016-07-011-74/+58
* | Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-084-16/+16
|\ \
| * | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messagesAlex Henrie2016-06-274-16/+16
* | | Merge branch 'lf/sideband-returns-void' into maintJunio C Hamano2016-08-083-15/+10
|\ \ \
| * | | upload-pack.c: make send_client_data() return voidlf/sideband-returns-voidLukas Fleischer2016-06-161-10/+5
| * | | sideband.c: make send_sideband() return voidLukas Fleischer2016-06-163-6/+6
| |/ /
* | | Merge branch 'jk/send-pack-stdio' into maintJunio C Hamano2016-08-083-29/+16
|\ \ \
| * | | write_or_die: remove the unused write_or_whine() functionjk/send-pack-stdioRamsay Jones2016-06-102-12/+0
| * | | send-pack: use buffered I/O to talk to pack-objectsJeff King2016-06-081-17/+16
* | | | Merge branch 'pb/commit-editmsg-path' into maintJunio C Hamano2016-08-081-7/+8
|\ \ \ \
| * | | | builtin/commit.c: memoize git-path for COMMIT_EDITMSGpb/commit-editmsg-pathPranit Bauva2016-06-091-7/+8
* | | | | Merge branch 'ew/find-perl-on-freebsd-in-local' into maintJunio C Hamano2016-08-081-0/+1
|\ \ \ \ \
| * | | | | config.mak.uname: correct perl path on FreeBSDew/find-perl-on-freebsd-in-localNguyễn Thái Ngọc Duy2016-07-261-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-08-082-3/+8
|\ \ \ \ \
| * | | | | Windows: add missing definition of ENOTSOCKew/daemon-socket-keepaliveJohannes Sixt2016-07-221-0/+3
| * | | | | daemon: ignore ENOTSOCK from setsockoptEric Wong2016-07-181-3/+5
* | | | | | Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-089-29/+54
|\ \ \ \ \ \
| * | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limitNguyễn Thái Ngọc Duy2016-07-134-6/+29
| * | | | | | pack-objects: do not truncate result in-pack object size on 32-bit systemsNguyễn Thái Ngọc Duy2016-07-131-7/+8
| * | | | | | index-pack: correct "offset" type in unpack_entry_data()Nguyễn Thái Ngọc Duy2016-07-131-1/+1
| * | | | | | index-pack: report correct bad object offsets even if they are largeNguyễn Thái Ngọc Duy2016-07-131-3/+4
| * | | | | | index-pack: correct "len" type in unpack_data()Nguyễn Thái Ngọc Duy2016-07-131-7/+7
| * | | | | | sha1_file.c: use type off_t* for object_info->disk_sizepNguyễn Thái Ngọc Duy2016-07-132-3/+3
| * | | | | | pack-objects: pass length to check_pack_crc() without truncationNguyễn Thái Ngọc Duy2016-07-122-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs/notes-merge-no-toctou' into maintJunio C Hamano2016-08-081-5/+1
|\ \ \ \ \ \
| * | | | | | notes-merge: use O_EXCL to avoid overwriting existing filesrs/notes-merge-no-toctouRené Scharfe2016-07-071-5/+1
| |/ / / / /
* | | | | | Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-083-3/+13
|\ \ \ \ \ \
| * | | | | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eolJohannes Schindelin2016-07-113-4/+6
| * | | | | | diff: demonstrate a bug with --patience and --ignore-space-at-eolJohannes Schindelin2016-07-111-0/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2016-08-082-2/+14
|\ \ \ \ \ \
| * | | | | | t5541: fix url scrubbing test when GPG is not setjk/push-scrub-urlJeff King2016-07-201-2/+4
| * | | | | | push: anonymize URL in status outputJeff King2016-07-142-2/+12
| |/ / / / /
* | | | | | Merge branch 'nd/cache-tree-ita' into maintJunio C Hamano2016-08-0815-53/+87
|\ \ \ \ \ \
| * | | | | | cache-tree: do not generate empty trees as a result of all i-t-a subentriesnd/cache-tree-itaNguyễn Thái Ngọc Duy2016-07-182-1/+23
| * | | | | | cache-tree.c: fix i-t-a entry skipping directory updates sometimesNguyễn Thái Ngọc Duy2016-07-182-2/+19
| * | | | | | test-lib.sh: introduce and use $EMPTY_BLOBNguyễn Thái Ngọc Duy2016-07-188-38/+35
| * | | | | | test-lib.sh: introduce and use $EMPTY_TREENguyễn Thái Ngọc Duy2016-07-186-13/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mh/blame-worktree' into maintJunio C Hamano2016-08-082-18/+71
|\ \ \ \ \ \
| * | | | | | t/t8003-blame-corner-cases.sh: Use here documentsMike Hommey2016-07-181-17/+17
| * | | | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-182-1/+54
| | |_|/ / / | |/| | | |
* | | | | | Some fixes for 2.9.3fbsd-lazy-mtimeJunio C Hamano2016-07-282-1/+59
* | | | | | Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2016-07-281-1/+6
|\ \ \ \ \ \
| * | | | | | t7610: test for mktemp before test executionArmin Kunaschik2016-07-061-1/+6
* | | | | | | Merge branch 'nd/icase' into maintJunio C Hamano2016-07-2811-21/+291
|\ \ \ \ \ \ \
| * | | | | | | grep.c: reuse "icase" variablend/icaseNguyễn Thái Ngọc Duy2016-07-011-4/+1
| * | | | | | | diffcore-pickaxe: support case insensitive match on non-asciiNguyễn Thái Ngọc Duy2016-07-012-0/+18
| * | | | | | | diffcore-pickaxe: Add regcomp_or_die()Nguyễn Thái Ngọc Duy2016-07-011-9/+13
| * | | | | | | grep/pcre: support utf-8Nguyễn Thái Ngọc Duy2016-07-012-0/+17