summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Merge branch 'ew/gc-auto-pack-limit-fix' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-07-281-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintJunio C Hamano2016-07-282-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-objects-optim'Junio C Hamano2016-08-081-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | pack-objects: compute local/ignore_pack_keep earlyjk/pack-objects-optimJeff King2016-07-291-1/+25
| * | | | | | | | | | | | | | | | | | | | | | pack-objects: break out of want_object loop earlyJeff King2016-07-291-0/+16
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-08-081-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | i18n: notes: mark comment for translationVasco Almeida2016-07-281-2/+3
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/reflog-date'Junio C Hamano2016-08-081-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | date: add "unix" formatJeff King2016-07-271-0/+3
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/clone-shallow-passthru' into maintJunio C Hamano2016-07-111-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/fetch-do-not-free-remote-name' into maintJunio C Hamano2016-07-111-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/deref-tag' into maintJunio C Hamano2016-07-061-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-07-063-11/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-271-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-clone-retry'Junio C Hamano2016-08-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | submodule-helper: fix indexing in clone retry error reporting pathJohannes Sixt2016-07-221-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/push-progress'Junio C Hamano2016-08-035-17/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | receive-pack: send keepalives during quiet periodsjk/push-progressJeff King2016-07-202-1/+72
| * | | | | | | | | | | | | | | | | | | | | | | | | | receive-pack: turn on connectivity progressJeff King2016-07-201-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | receive-pack: relay connectivity errors to sidebandJeff King2016-07-201-1/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | receive-pack: turn on index-pack resolving progressJeff King2016-07-201-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | index-pack: add flag for showing delta-resolution progressJeff King2016-07-201-1/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | clone: use a real progress meter for connectivity checkJeff King2016-07-201-4/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | check_everything_connected: use a struct with named optionsJeff King2016-07-203-11/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | rev-list: add optional progress reportingJeff King2016-07-201-0/+17
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/parse-options-concat'Junio C Hamano2016-08-031-9/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | parse_options: allocate a new array when concatenatingjk/parse-options-concatJeff King2016-07-061-9/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/push-options'Junio C Hamano2016-08-032-16/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | push: accept push optionsStefan Beller2016-07-141-3/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | receive-pack: implement advertising and receiving push optionsStefan Beller2016-07-141-0/+30
| * | | | | | | | | | | | | | | | | | | | | | | | | push options: {pre,post}-receive hook learns about push optionsStefan Beller2016-07-141-13/+34
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'os/no-verify-skips-commit-msg-too'Junio C Hamano2016-08-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | commit: describe that --no-verify skips the commit-msg hook in the help textos/no-verify-skips-commit-msg-tooOrgad Shaneh2016-07-261-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit'Junio C Hamano2016-07-284-21/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | fsck: use streaming interface for large blobs in packnd/pack-ofs-4gb-limitNguyễn Thái Ngọc Duy2016-07-131-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | 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-131-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | pack-objects: pass length to check_pack_crc() without truncationNguyễn Thái Ngọc Duy2016-07-121-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-281-0/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-081-0/+28
| * | | | | | | | | | | | | | | | | | | | | | worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-081-0/+38
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-07-251-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-181-1/+9
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/fsck-name-object'Junio C Hamano2016-07-251-18/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fsck: optionally show more helpful info for broken linksJohannes Schindelin2016-07-181-4/+38
| * | | | | | | | | | | | | | | | | | | | | | fsck: give the error function a chance to see the fsck_optionsJohannes Schindelin2016-07-181-1/+2