aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/push-progress'Junio C Hamano2016-08-03
|\
| * receive-pack: send keepalives during quiet periodsJeff King2016-07-20
| * receive-pack: turn on connectivity progressJeff King2016-07-20
| * receive-pack: relay connectivity errors to sidebandJeff King2016-07-20
| * receive-pack: turn on index-pack resolving progressJeff King2016-07-20
| * index-pack: add flag for showing delta-resolution progressJeff King2016-07-20
| * clone: use a real progress meter for connectivity checkJeff King2016-07-20
| * check_everything_connected: use a struct with named optionsJeff King2016-07-20
| * rev-list: add optional progress reportingJeff King2016-07-20
* | Merge branch 'jk/parse-options-concat'Junio C Hamano2016-08-03
|\ \
| * | parse_options: allocate a new array when concatenatingJeff King2016-07-06
* | | Merge branch 'sb/push-options'Junio C Hamano2016-08-03
|\ \ \
| * | | push: accept push optionsStefan Beller2016-07-14
| * | | receive-pack: implement advertising and receiving push optionsStefan Beller2016-07-14
| * | | push options: {pre,post}-receive hook learns about push optionsStefan Beller2016-07-14
* | | | Merge branch 'os/no-verify-skips-commit-msg-too'Junio C Hamano2016-08-03
|\ \ \ \
| * | | | commit: describe that --no-verify skips the commit-msg hook in the help textOrgad Shaneh2016-07-26
* | | | | Merge branch 'nd/pack-ofs-4gb-limit'Junio C Hamano2016-07-28
|\ \ \ \ \
| * | | | | fsck: use streaming interface for large blobs in packNguyễn Thái Ngọc Duy2016-07-13
| * | | | | pack-objects: do not truncate result in-pack object size on 32-bit systemsNguyễn Thái Ngọc Duy2016-07-13
| * | | | | index-pack: correct "offset" type in unpack_entry_data()Nguyễn Thái Ngọc Duy2016-07-13
| * | | | | index-pack: report correct bad object offsets even if they are largeNguyễn Thái Ngọc Duy2016-07-13
| * | | | | index-pack: correct "len" type in unpack_data()Nguyễn Thái Ngọc Duy2016-07-13
| * | | | | sha1_file.c: use type off_t* for object_info->disk_sizepNguyễn Thái Ngọc Duy2016-07-13
| * | | | | pack-objects: pass length to check_pack_crc() without truncationNguyễn Thái Ngọc Duy2016-07-12
| | |_|/ / | |/| | |
* | | | | Merge branch 'nd/worktree-lock'Junio C Hamano2016-07-28
|\ \ \ \ \
| * | | | | worktree: add "unlock" commandNguyễn Thái Ngọc Duy2016-07-08
| * | | | | worktree: add "lock" commandNguyễn Thái Ngọc Duy2016-07-08
* | | | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-07-25
|\ \ \ \ \ \
| * | | | | | blame: allow to blame paths freshly added to the indexMike Hommey2016-07-18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/fsck-name-object'Junio C Hamano2016-07-25
|\ \ \ \ \ \
| * | | | | | fsck: optionally show more helpful info for broken linksJohannes Schindelin2016-07-18
| * | | | | | fsck: give the error function a chance to see the fsck_optionsJohannes Schindelin2016-07-18
| * | | | | | fsck: refactor how to describe objectsJohannes Schindelin2016-07-18
* | | | | | | Merge branch 'rs/rm-strbuf-optim'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \
| * | | | | | | rm: reuse strbuf for all remove_dir_recursively() callsRené Scharfe2016-07-12
* | | | | | | | Merge branch 'mh/ref-iterators'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \
| * | | | | | | | remote rm: handle symbolic refs correctlyMichael Haggerty2016-06-20
| * | | | | | | | delete_refs(): add a flags argumentMichael Haggerty2016-06-20
* | | | | | | | | Merge branch 'mh/split-under-lock'Junio C Hamano2016-07-25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | delete_branches(): use resolve_refdup()Michael Haggerty2016-06-13
* | | | | | | | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano2016-07-19
|\ \ \ \ \ \ \ \
| * | | | | | | | am: counteract gender biasJohannes Schindelin2016-07-08
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/write-file'Junio C Hamano2016-07-19
|\ \ \ \ \ \ \ \
| * | | | | | | | branch: use write_file_buf instead of write_fileJeff King2016-07-08
| * | | | | | | | use write_file_buf where applicableJeff King2016-07-08
| * | | | | | | | branch: use non-gentle write_file for branch descriptionJeff King2016-07-08
| * | | | | | | | am: ignore return value of write_file()René Scharfe2016-07-08
| * | | | | | | | config: fix bogus fd check when setting up default configJeff King2016-07-08
* | | | | | | | | Merge branch 'jk/printf-format'Junio C Hamano2016-07-19
|\ \ \ \ \ \ \ \ \