Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | status: unit tests for --porcelain=v2jh/status-v2-porcelain | Jeff Hostetler | 2016-08-12 | 1 | -0/+593 |
* | test-lib-functions.sh: add lf_to_nul helper | Jeff Hostetler | 2016-08-11 | 1 | -0/+4 |
* | git-status.txt: describe --porcelain=v2 format | Jeff Hostetler | 2016-08-11 | 1 | -4/+122 |
* | status: print branch info with --porcelain=v2 --branch | Jeff Hostetler | 2016-08-11 | 3 | -0/+96 |
* | status: print per-file porcelain v2 status data | Jeff Hostetler | 2016-08-11 | 1 | -1/+284 |
* | status: collect per-file data for --porcelain=v2 | Jeff Hostetler | 2016-08-11 | 3 | -2/+69 |
* | status: support --porcelain[=<version>] | Jeff Hostetler | 2016-08-05 | 3 | -5/+44 |
* | status: cleanup API to wt_status_print | Jeff Hostetler | 2016-08-05 | 3 | -49/+43 |
* | status: rename long-format print routines | Jeff Hostetler | 2016-08-05 | 3 | -58/+58 |
* | Sync with maint | Junio C Hamano | 2016-07-28 | 1 | -0/+58 |
|\ | |||||
| * | Some fixes for 2.9.3fbsd-lazy-mtime | Junio C Hamano | 2016-07-28 | 2 | -1/+59 |
| * | Merge branch 'ak/lazy-prereq-mktemp' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+6 |
| |\ | |||||
| * \ | Merge branch 'nd/icase' into maint | Junio C Hamano | 2016-07-28 | 11 | -21/+291 |
| |\ \ | |||||
| * \ \ | Merge branch 'sb/submodule-parallel-fetch' into maint | Junio C Hamano | 2016-07-28 | 1 | -16/+27 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maint | Junio C Hamano | 2016-07-28 | 1 | -4/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/test-match-signal' into maint | Junio C Hamano | 2016-07-28 | 3 | -11/+26 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint | Junio C Hamano | 2016-07-28 | 1 | -8/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'js/t3404-grammo-fix' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'nd/doc-new-command' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ew/gc-auto-pack-limit-fix' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'js/color-on-windows-comment' into maint | Junio C Hamano | 2016-07-28 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/doc-tt' into maint | Junio C Hamano | 2016-07-28 | 62 | -227/+228 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/sign-empty-commit-fix' into maint | Junio C Hamano | 2016-07-28 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | 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 |