summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* completion: add completion for --submodule=* diff optionjk/completion-diff-submoduleJacob Keller2016-08-091-0/+19
* Hopefully final batch for 2.9.3Junio C Hamano2016-08-081-0/+34
* Merge branch 'sb/pack-protocol-doc-nak' into maintJunio C Hamano2016-08-081-1/+1
|\
| * Documentation: pack-protocol correct NAK responsesb/pack-protocol-doc-nakStefan Beller2016-07-221-1/+1
* | Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-083-17/+28
|\ \
| * | submodule-config: fix test binary crashing when no arguments givenrs/submodule-config-code-cleanupHeiko Voigt2016-07-281-1/+1
| * | submodule-config: combine early return code into one gotoHeiko Voigt2016-07-281-19/+12
| * | submodule-config: passing name reference for .gitmodule blobsHeiko Voigt2016-07-282-9/+28
| * | submodule-config: use explicit empty string instead of strbuf in config_from()René Scharfe2016-07-191-2/+1
* | | Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-08-081-2/+0
|\ \ \
| * | | submodule deinit: remove outdated commentsb/submodule-deinit-allStefan Beller2016-07-261-2/+0
* | | | Merge branch 'rs/worktree-use-strbuf-absolute-path' into maintJunio C Hamano2016-08-081-2/+2
|\ \ \ \
| * | | | worktree: use strbuf_add_absolute_path() directlyrs/worktree-use-strbuf-absolute-pathRené Scharfe2016-07-121-2/+2
* | | | | Merge branch 'jc/doc-diff-filter-exclude' into maintJunio C Hamano2016-08-081-0/+3
|\ \ \ \ \
| * | | | | diff: document diff-filter exclusionjc/doc-diff-filter-excludeJunio C Hamano2016-07-141-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-082-11/+3
|\ \ \ \ \
| * | | | | t/test-lib.sh: fix running tests with --valgrindJohannes Schindelin2016-07-111-1/+1
| * | | | | Makefile: use VCSSVN_LIB to refer to svn libraryJeff King2016-07-061-2/+2
| * | | | | Makefile: drop extra dependencies for test helpersJeff King2016-07-061-8/+0
* | | | | | Merge branch 'rs/use-strbuf-addbuf' into maintJunio C Hamano2016-08-085-8/+11
|\ \ \ \ \ \
| * | | | | | strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()rs/use-strbuf-addbufRené Scharfe2016-07-222-5/+8
| * | | | | | use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe2016-07-193-3/+3
* | | | | | | 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
| |/ / / / / / / / /