summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* builtin/am: use apply API in run_apply()cc/apply-amChristian Couder2016-09-071-22/+43
* apply: learn to use a different index fileChristian Couder2016-09-072-6/+22
* apply: pass apply state to build_fake_ancestor()Christian Couder2016-09-071-4/+5
* apply: refactor `git apply` option parsingChristian Couder2016-09-073-98/+97
* apply: change error_routine when silentChristian Couder2016-09-072-1/+28
* usage: add get_error_routine() and get_warn_routine()Christian Couder2016-09-072-0/+12
* usage: add set_warn_routine()Christian Couder2016-09-072-0/+6
* apply: don't print on stdout in verbosity_silent modeChristian Couder2016-09-071-3/+3
* apply: make it possible to silently applyChristian Couder2016-09-073-24/+48
* apply: use error_errno() where possibleChristian Couder2016-09-071-8/+8
* apply: make some parsing functions static againChristian Couder2016-09-072-8/+3
* apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder2016-09-073-4732/+4751
* apply: rename and move opt constants to apply.hChristian Couder2016-09-072-7/+11
* 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-113-32/+33
* 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-113-9/+11
* builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-114-91/+105
* 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-112-6/+15
* 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-112-13/+29
* 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-112-97/+101
* apply: make some names more specificChristian Couder2016-08-111-10/+10
* Sync with maintJunio C Hamano2016-07-281-0/+58
|\
| * Some fixes for 2.9.3fbsd-lazy-mtimeJunio C Hamano2016-07-282-1/+59
| * Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2016-07-281-1/+6
| |\
| * \ Merge branch 'nd/icase' into maintJunio C Hamano2016-07-2811-21/+291
| |\ \
| * \ \ Merge branch 'sb/submodule-parallel-fetch' into maintJunio C Hamano2016-07-281-16/+27
| |\ \ \
| * \ \ \ Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maintJunio C Hamano2016-07-281-4/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/test-match-signal' into maintJunio C Hamano2016-07-283-11/+26
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maintJunio C Hamano2016-07-281-8/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/t3404-grammo-fix' into maintJunio C Hamano2016-07-281-1/+1
| |\ \ \ \ \ \ \