summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* apply: refactor `git apply` option parsingChristian Couder2016-09-071-71/+3
* apply: make it possible to silently applyChristian Couder2016-09-071-1/+1
* apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder2016-09-071-4732/+1
* apply: rename and move opt constants to apply.hChristian Couder2016-09-071-7/+4
* builtin/apply: rename option parsing functionsChristian Couder2016-09-071-20/+20
* builtin/apply: make create_one_file() return -1 on errorChristian Couder2016-09-071-15/+21
* builtin/apply: make try_create_file() return -1 on errorChristian Couder2016-09-071-11/+33
* builtin/apply: make write_out_results() return -1 on errorChristian Couder2016-08-111-6/+21
* builtin/apply: make write_out_one_result() return -1 on errorChristian Couder2016-08-111-22/+16
* builtin/apply: make create_file() return -1 on errorChristian Couder2016-08-111-12/+13
* builtin/apply: make add_index_file() return -1 on errorChristian Couder2016-08-111-17/+31
* builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder2016-08-111-7/+13
* builtin/apply: make remove_file() return -1 on errorChristian Couder2016-08-111-6/+11
* builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder2016-08-111-15/+26
* builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder2016-08-111-11/+21
* builtin/apply: make gitdiff_*() return -1 on errorChristian Couder2016-08-111-19/+21
* builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder2016-08-111-3/+9
* builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder2016-08-111-6/+9
* builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder2016-08-111-11/+26
* builtin/apply: move check_apply_state() to apply.cChristian Couder2016-08-111-32/+0
* builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder2016-08-111-8/+11
* apply: make init_apply_state() return -1 instead of exit()ingChristian Couder2016-08-111-1/+2
* builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-111-91/+0
* builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die(...Christian Couder2016-08-111-7/+7
* builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder2016-08-111-11/+12
* builtin/apply: make parse_single_patch() return -1 on errorChristian Couder2016-08-111-4/+13
* builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder2016-08-111-8/+14
* builtin/apply: make find_header() return -128 instead of die()ingChristian Couder2016-08-111-12/+28
* builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder2016-08-111-3/+5
* builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder2016-08-111-15/+45
* apply: move 'struct apply_state' to apply.hChristian Couder2016-08-111-97/+1
* apply: make some names more specificChristian Couder2016-08-111-10/+10
* 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
|\ \ \ \