Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maint | Junio C Hamano | 2016-07-28 | 2 | -0/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/ita-cleanup' into maint | Junio C Hamano | 2016-07-28 | 2 | -3/+61 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint | Junio C Hamano | 2016-07-28 | 7 | -15/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dg/subtree-rebase-test' into maint | Junio C Hamano | 2016-07-28 | 1 | -0/+119 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | Eighth batch of topics for 2.10 | Junio C Hamano | 2016-07-28 | 1 | -19/+34 | |
* | | | | | | | | | | | | | | | | | | t9100: portability fix | Junio C Hamano | 2016-07-28 | 1 | -2/+4 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'master' of git://git.bogomips.org/git-svn | Junio C Hamano | 2016-07-28 | 3 | -2/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | git-svn: allow --version to work anywhere | Eric Wong | 2016-07-22 | 2 | -2/+21 | |
| * | | | | | | | | | | | | | | | | | | git-svn: document svn.authorsProg in config | Eric Wong | 2016-07-19 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-deinit-all' | Junio C Hamano | 2016-07-28 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | submodule deinit: remove outdated commentsb/submodule-deinit-all | Stefan Beller | 2016-07-26 | 1 | -2/+0 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/find-perl-on-freebsd-in-local' | Junio C Hamano | 2016-07-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | config.mak.uname: correct perl path on FreeBSDew/find-perl-on-freebsd-in-local | Nguyễn Thái Ngọc Duy | 2016-07-26 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/daemon-socket-keepalive' | Junio C Hamano | 2016-07-28 | 2 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Windows: add missing definition of ENOTSOCKew/daemon-socket-keepalive | 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' | Junio C Hamano | 2016-07-28 | 9 | -29/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limit | 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 | |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-lock' | Junio C Hamano | 2016-07-28 | 6 | -7/+260 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | worktree.c: find_worktree() search by path suffix | Nguyễn Thái Ngọc Duy | 2016-07-08 | 2 | -0/+34 | |
| * | | | | | | | | | | | | | | | | | | | | | | worktree: add "unlock" command | Nguyễn Thái Ngọc Duy | 2016-07-08 | 4 | -1/+48 | |
| * | | | | | | | | | | | | | | | | | | | | | | worktree: add "lock" command | Nguyễn Thái Ngọc Duy | 2016-07-08 | 4 | -7/+110 | |
| * | | | | | | | | | | | | | | | | | | | | | | worktree.c: add is_worktree_locked() | Nguyễn Thái Ngọc Duy | 2016-06-13 | 2 | -0/+36 | |
| * | | | | | | | | | | | | | | | | | | | | | | worktree.c: add is_main_worktree() | Nguyễn Thái Ngọc Duy | 2016-06-03 | 2 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | worktree.c: add find_worktree() | Nguyễn Thái Ngọc Duy | 2016-06-03 | 2 | -0/+23 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/notes-merge-no-toctou' | Junio C Hamano | 2016-07-28 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | notes-merge: use O_EXCL to avoid overwriting existing filesrs/notes-merge-no-toctou | René Scharfe | 2016-07-07 | 1 | -5/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-tests' | Junio C Hamano | 2016-07-28 | 2 | -0/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | rebase -i: we allow extra spaces after fixup!/squash!js/rebase-i-tests | Johannes Schindelin | 2016-07-07 | 1 | -0/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | rebase -i: demonstrate a bug with --autosquash | Johannes Schindelin | 2016-07-07 | 1 | -0/+24 | |
| * | | | | | | | | | | | | | | | | | | | | | | | t3404: add a test for the --gpg-sign option | Johannes Schindelin | 2016-07-07 | 1 | -0/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Seventh batch of topics for 2.10 | Junio C Hamano | 2016-07-25 | 1 | -0/+69 | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/use-strbuf-addbuf' | Junio C Hamano | 2016-07-25 | 5 | -8/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()rs/use-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 'ew/autoconf-pthread' | Junio C Hamano | 2016-07-25 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | configure.ac: stronger test for pthread linkageew/autoconf-pthread | Eric Wong | 2016-07-18 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/blame-worktree' | Junio C Hamano | 2016-07-25 | 2 | -18/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t/t8003-blame-corner-cases.sh: Use here documents | Mike Hommey | 2016-07-18 | 1 | -17/+17 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | blame: allow to blame paths freshly added to the index | Mike Hommey | 2016-07-18 | 2 | -1/+54 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/fsck-name-object' | Junio C Hamano | 2016-07-25 | 5 | -31/+200 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: optionally show more helpful info for broken links | Johannes Schindelin | 2016-07-18 | 4 | -9/+85 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: give the error function a chance to see the fsck_options | Johannes Schindelin | 2016-07-18 | 3 | -5/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | fsck_walk(): optionally name objects on the go | Johannes Schindelin | 2016-07-18 | 2 | -4/+84 |