summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* status: cleanup API to wt_status_printJeff Hostetler2016-08-051-42/+9
* status: rename long-format print routinesJeff Hostetler2016-08-051-2/+2
* 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
| * | | fsck: refactor how to describe objectsJohannes Schindelin2016-07-181-14/+23
* | | | Merge branch 'rs/rm-strbuf-optim'Junio C Hamano2016-07-251-2/+3
|\ \ \ \
| * | | | rm: reuse strbuf for all remove_dir_recursively() callsrs/rm-strbuf-optimRené Scharfe2016-07-121-2/+3
* | | | | Merge branch 'mh/ref-iterators'Junio C Hamano2016-07-252-7/+3
|\ \ \ \ \
| * | | | | remote rm: handle symbolic refs correctlyMichael Haggerty2016-06-201-5/+1
| * | | | | delete_refs(): add a flags argumentMichael Haggerty2016-06-202-3/+3
* | | | | | Merge branch 'mh/split-under-lock'Junio C Hamano2016-07-251-8/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | delete_branches(): use resolve_refdup()Michael Haggerty2016-06-131-8/+11
* | | | | | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano2016-07-191-8/+8
|\ \ \ \ \ \
| * | | | | | am: counteract gender biasjs/am-call-theirs-theirs-in-fallback-3wayJohannes Schindelin2016-07-081-8/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/write-file'Junio C Hamano2016-07-194-60/+17
|\ \ \ \ \ \
| * | | | | | branch: use write_file_buf instead of write_filejk/write-fileJeff King2016-07-081-1/+1
| * | | | | | use write_file_buf where applicableJeff King2016-07-082-46/+6
| * | | | | | branch: use non-gentle write_file for branch descriptionJeff King2016-07-081-4/+1
| * | | | | | am: ignore return value of write_file()René Scharfe2016-07-081-9/+9
| * | | | | | config: fix bogus fd check when setting up default configJeff King2016-07-081-1/+1
* | | | | | | Merge branch 'jk/printf-format'Junio C Hamano2016-07-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | avoid using sha1_to_hex output as printf formatJeff King2016-07-081-1/+1
* | | | | | | | Merge branch 'nd/fetch-ref-summary'Junio C Hamano2016-07-191-40/+157
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: reduce duplicate in ref update status lines with placeholderNguyễn Thái Ngọc Duy2016-07-061-1/+76
| * | | | | | | | fetch: align all "remote -> local" outputNguyễn Thái Ngọc Duy2016-07-061-2/+45
| * | | | | | | | fetch: change flag code for displaying tag update and deleted refNguyễn Thái Ngọc Duy2016-06-271-2/+2
| * | | | | | | | fetch: refactor ref update status formatting codeNguyễn Thái Ngọc Duy2016-06-271-39/+38
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bc/cocci'Junio C Hamano2016-07-196-30/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-281-10/+10
| * | | | | | | | diff: convert struct diff_filespec to struct object_idbrian m. carlson2016-06-283-10/+10
| * | | | | | | | coccinelle: apply object_id Coccinelle transformationsbrian m. carlson2016-06-281-7/+6
| * | | | | | | | coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson2016-06-282-3/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'js/log-to-diffopt-file'Junio C Hamano2016-07-192-44/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | shortlog: respect the --output=<file> settingJohannes Schindelin2016-06-241-1/+3
| * | | | | | | | format-patch: use stdout directlyJohannes Schindelin2016-06-241-5/+1
| * | | | | | | | format-patch: avoid freopen()Johannes Schindelin2016-06-241-31/+33