summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2016-08-11builtin/apply: make add_index_file() return -1 on errorLibravatar Christian Couder1-17/+31
2016-08-11builtin/apply: make add_conflicted_stages_file() return -1 on errorLibravatar Christian Couder1-7/+13
2016-08-11builtin/apply: make remove_file() return -1 on errorLibravatar Christian Couder1-6/+11
2016-08-11builtin/apply: make build_fake_ancestor() return -1 on errorLibravatar Christian Couder1-15/+26
2016-08-11builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Libravatar Christian Couder1-11/+21
2016-08-11builtin/apply: make gitdiff_*() return -1 on errorLibravatar Christian Couder1-19/+21
2016-08-11builtin/apply: make gitdiff_*() return 1 at end of headerLibravatar Christian Couder1-3/+9
2016-08-11builtin/apply: make parse_traditional_patch() return -1 on errorLibravatar Christian Couder1-6/+9
2016-08-11builtin/apply: make apply_all_patches() return 128 or 1 on errorLibravatar Christian Couder1-11/+26
2016-08-11builtin/apply: move check_apply_state() to apply.cLibravatar Christian Couder3-32/+33
2016-08-11builtin/apply: make check_apply_state() return -1 instead of die()ingLibravatar Christian Couder1-8/+11
2016-08-11apply: make init_apply_state() return -1 instead of exit()ingLibravatar Christian Couder3-9/+11
2016-08-11builtin/apply: move init_apply_state() to apply.cLibravatar Christian Couder4-91/+105
2016-08-11builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die(...Libravatar Christian Couder1-7/+7
2016-08-11builtin/apply: make parse_whitespace_option() return -1 instead of die()ingLibravatar Christian Couder1-11/+12
2016-08-11builtin/apply: make parse_single_patch() return -1 on errorLibravatar Christian Couder2-6/+15
2016-08-11builtin/apply: make parse_chunk() return a negative integer on errorLibravatar Christian Couder1-8/+14
2016-08-11builtin/apply: make find_header() return -128 instead of die()ingLibravatar Christian Couder2-13/+29
2016-08-11builtin/apply: read_patch_file() return -1 instead of die()ingLibravatar Christian Couder1-3/+5
2016-08-11builtin/apply: make apply_patch() return -1 or -128 instead of die()ingLibravatar Christian Couder1-15/+45
2016-08-11apply: move 'struct apply_state' to apply.hLibravatar Christian Couder2-97/+101
2016-08-11apply: make some names more specificLibravatar Christian Couder1-10/+10
2016-07-28Sync with maintLibravatar Junio C Hamano1-0/+58
2016-07-28Eighth batch of topics for 2.10Libravatar Junio C Hamano1-19/+34
2016-07-28t9100: portability fixLibravatar Junio C Hamano1-2/+4
2016-07-28Merge branch 'master' of git://git.bogomips.org/git-svnLibravatar Junio C Hamano3-2/+24
2016-07-28Some fixes for 2.9.3Libravatar Junio C Hamano2-1/+59
2016-07-28Merge branch 'ak/lazy-prereq-mktemp' into maintLibravatar Junio C Hamano1-1/+6
2016-07-28Merge branch 'nd/icase' into maintLibravatar Junio C Hamano11-21/+291
2016-07-28Merge branch 'sb/submodule-parallel-fetch' into maintLibravatar Junio C Hamano1-16/+27
2016-07-28Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintLibravatar Junio C Hamano1-4/+3
2016-07-28Merge branch 'jk/test-match-signal' into maintLibravatar Junio C Hamano3-11/+26
2016-07-28Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintLibravatar Junio C Hamano1-8/+8
2016-07-28Merge branch 'js/t3404-grammo-fix' into maintLibravatar Junio C Hamano1-1/+1
2016-07-28Merge branch 'nd/doc-new-command' into maintLibravatar Junio C Hamano1-1/+1
2016-07-28Merge branch 'ew/gc-auto-pack-limit-fix' into maintLibravatar Junio C Hamano1-1/+1
2016-07-28Merge branch 'js/color-on-windows-comment' into maintLibravatar Junio C Hamano1-5/+0
2016-07-28Merge branch 'mm/doc-tt' into maintLibravatar Junio C Hamano62-227/+228
2016-07-28Merge branch 'js/sign-empty-commit-fix' into maintLibravatar Junio C Hamano1-1/+6
2016-07-28Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maintLibravatar Junio C Hamano2-0/+32
2016-07-28Merge branch 'nd/ita-cleanup' into maintLibravatar Junio C Hamano2-3/+61
2016-07-28Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maintLibravatar Junio C Hamano7-15/+31
2016-07-28Merge branch 'dg/subtree-rebase-test' into maintLibravatar Junio C Hamano1-0/+119
2016-07-28Merge branch 'sb/submodule-deinit-all'Libravatar Junio C Hamano1-2/+0
2016-07-28Merge branch 'ew/find-perl-on-freebsd-in-local'Libravatar Junio C Hamano1-0/+1
2016-07-28Merge branch 'ew/daemon-socket-keepalive'Libravatar Junio C Hamano2-3/+8
2016-07-28Merge branch 'nd/pack-ofs-4gb-limit'Libravatar Junio C Hamano9-29/+54
2016-07-28Merge branch 'nd/worktree-lock'Libravatar Junio C Hamano6-7/+260
2016-07-28Merge branch 'rs/notes-merge-no-toctou'Libravatar Junio C Hamano1-5/+1
2016-07-28Merge branch 'js/rebase-i-tests'Libravatar Junio C Hamano2-0/+41