Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | .gitattributes: set file type for C files | René Scharfe | 2016-07-07 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'mm/status-suggest-merge-abort' into maint | Junio C Hamano | 2016-08-10 | 3 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | status: suggest 'git merge --abort' when appropriate | Matthieu Moy | 2016-07-22 | 3 | -2/+10 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Hopefully final batch for 2.9.3 | Junio C Hamano | 2016-08-08 | 1 | -0/+34 | |
* | | | | | | | | | Merge branch 'sb/pack-protocol-doc-nak' into maint | Junio C Hamano | 2016-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Documentation: pack-protocol correct NAK response | Stefan Beller | 2016-07-22 | 1 | -1/+1 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'rs/submodule-config-code-cleanup' into maint | Junio C Hamano | 2016-08-08 | 3 | -17/+28 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | submodule-config: fix test binary crashing when no arguments given | Heiko Voigt | 2016-07-28 | 1 | -1/+1 | |
| * | | | | | | | | | submodule-config: combine early return code into one goto | Heiko Voigt | 2016-07-28 | 1 | -19/+12 | |
| * | | | | | | | | | submodule-config: passing name reference for .gitmodule blobs | Heiko Voigt | 2016-07-28 | 2 | -9/+28 | |
| * | | | | | | | | | submodule-config: use explicit empty string instead of strbuf in config_from() | René Scharfe | 2016-07-19 | 1 | -2/+1 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'sb/submodule-deinit-all' into maint | Junio C Hamano | 2016-08-08 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | submodule deinit: remove outdated comment | Stefan Beller | 2016-07-26 | 1 | -2/+0 | |
* | | | | | | | | | | Merge branch 'rs/worktree-use-strbuf-absolute-path' into maint | Junio C Hamano | 2016-08-08 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | worktree: use strbuf_add_absolute_path() directly | René Scharfe | 2016-07-13 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge branch 'jc/doc-diff-filter-exclude' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | diff: document diff-filter exclusion | Junio C Hamano | 2016-07-14 | 1 | -0/+3 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'nd/test-helpers' into maint | Junio C Hamano | 2016-08-08 | 2 | -11/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | t/test-lib.sh: fix running tests with --valgrind | Johannes Schindelin | 2016-07-11 | 1 | -1/+1 | |
| * | | | | | | | | | | | Makefile: use VCSSVN_LIB to refer to svn library | Jeff King | 2016-07-06 | 1 | -2/+2 | |
| * | | | | | | | | | | | Makefile: drop extra dependencies for test helpers | Jeff King | 2016-07-06 | 1 | -8/+0 | |
* | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addbuf' into maint | Junio C Hamano | 2016-08-08 | 5 | -8/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf() | René Scharfe | 2016-07-22 | 2 | -5/+8 | |
| * | | | | | | | | | | | | use strbuf_addbuf() for appending a strbuf to another | René Scharfe | 2016-07-19 | 3 | -3/+3 | |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'lf/recv-sideband-cleanup' into maint | Junio C Hamano | 2016-08-08 | 1 | -74/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | sideband.c: small optimization of strbuf usage | Nicolas Pitre | 2016-07-06 | 1 | -3/+3 | |
| * | | | | | | | | | | | | sideband.c: refactor recv_sideband() | Lukas Fleischer | 2016-07-01 | 1 | -74/+58 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'ah/unpack-trees-advice-messages' into maint | Junio C Hamano | 2016-08-08 | 4 | -16/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | unpack-trees: fix English grammar in do-this-before-that messages | Alex Henrie | 2016-06-27 | 4 | -16/+16 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'lf/sideband-returns-void' into maint | Junio C Hamano | 2016-08-08 | 3 | -15/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | upload-pack.c: make send_client_data() return void | Lukas Fleischer | 2016-06-16 | 1 | -10/+5 | |
| * | | | | | | | | | | | | sideband.c: make send_sideband() return void | Lukas Fleischer | 2016-06-16 | 3 | -6/+6 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'jk/send-pack-stdio' into maint | Junio C Hamano | 2016-08-08 | 3 | -29/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | write_or_die: remove the unused write_or_whine() function | Ramsay Jones | 2016-06-10 | 2 | -12/+0 | |
| * | | | | | | | | | | | | send-pack: use buffered I/O to talk to pack-objects | Jeff King | 2016-06-09 | 1 | -17/+16 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'pb/commit-editmsg-path' into maint | Junio C Hamano | 2016-08-08 | 1 | -7/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | builtin/commit.c: memoize git-path for COMMIT_EDITMSG | Pranit Bauva | 2016-06-09 | 1 | -7/+8 | |
* | | | | | | | | | | | | | Merge branch 'ew/find-perl-on-freebsd-in-local' into maint | Junio C Hamano | 2016-08-08 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | config.mak.uname: correct perl path on FreeBSD | Nguyễn Thái Ngọc Duy | 2016-07-26 | 1 | -0/+1 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ew/daemon-socket-keepalive' into maint | Junio C Hamano | 2016-08-08 | 2 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Windows: add missing definition of ENOTSOCK | Johannes Sixt | 2016-07-22 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | daemon: ignore ENOTSOCK from setsockopt | Eric Wong | 2016-07-18 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit' into maint | Junio C Hamano | 2016-08-08 | 9 | -29/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | fsck: use streaming interface for large blobs in pack | Nguyễn Thái Ngọc Duy | 2016-07-13 | 4 | -6/+29 | |
| * | | | | | | | | | | | | | | pack-objects: do not truncate result in-pack object size on 32-bit systems | Nguyễn Thái Ngọc Duy | 2016-07-13 | 1 | -7/+8 | |
| * | | | | | | | | | | | | | | index-pack: correct "offset" type in unpack_entry_data() | Nguyễn Thái Ngọc Duy | 2016-07-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | index-pack: report correct bad object offsets even if they are large | Nguyễn Thái Ngọc Duy | 2016-07-13 | 1 | -3/+4 | |
| * | | | | | | | | | | | | | | index-pack: correct "len" type in unpack_data() | Nguyễn Thái Ngọc Duy | 2016-07-13 | 1 | -7/+7 | |
| * | | | | | | | | | | | | | | sha1_file.c: use type off_t* for object_info->disk_sizep | Nguyễn Thái Ngọc Duy | 2016-07-13 | 2 | -3/+3 | |
| * | | | | | | | | | | | | | | pack-objects: pass length to check_pack_crc() without truncation | Nguyễn Thái Ngọc Duy | 2016-07-12 | 2 | -2/+2 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | |