summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use smudgeToFile filter in recursive mergejh/clean-smudge-annexJoey Hess2016-08-012-12/+57
* use smudgeToFile filter in git amJoey Hess2016-08-014-19/+56
* better recovery from failure of smudgeToFile filterJoey Hess2016-08-012-22/+68
* warn on unusable smudgeToFile/cleanFromFile configJoey Hess2016-08-011-10/+26
* use smudgeToFile in git checkout etcJoey Hess2016-08-012-10/+64
* use cleanFromFile in git addJoey Hess2016-08-012-6/+72
* add smudgeToFile and cleanFromFile filter configsJoey Hess2016-08-014-16/+160
* clarify %f documentationJoey Hess2016-08-011-0/+5
* Merge branch 'cc/apply-am' into HEADJunio C Hamano2016-08-01319-7361/+11781
|\
| * fixup! apply: make it possible to silently applyJunio C Hamano2016-08-011-1/+1
| * builtin/am: use apply api in run_apply()Christian Couder2016-08-011-18/+47
| * apply: refactor `git apply` option parsingChristian Couder2016-08-013-71/+84
| * apply: change error_routine when silentChristian Couder2016-08-012-1/+24
| * usage: add get_error_routine() and get_warn_routine()Christian Couder2016-08-012-0/+12
| * usage: add set_warn_routine()Christian Couder2016-08-012-0/+6
| * apply: don't print on stdout in verbosity_silent modeChristian Couder2016-08-011-3/+3
| * apply: make it possible to silently applyChristian Couder2016-08-013-24/+48
| * write_or_die: use warning() instead of fprintf(stderr, ...)Christian Couder2016-08-011-2/+1
| * environment: add set_index_file()Christian Couder2016-08-012-0/+13
| * apply: use error_errno() where possibleChristian Couder2016-08-011-9/+9
| * apply: make some parsing functions static againChristian Couder2016-08-012-8/+3
| * apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder2016-08-013-4729/+4748
| * apply: rename and move opt constants to apply.hChristian Couder2016-08-012-7/+7
| * builtin/apply: rename option parsing functionsChristian Couder2016-08-011-20/+20
| * builtin/apply: make create_one_file() return -1 on errorChristian Couder2016-08-011-15/+21
| * builtin/apply: make try_create_file() return -1 on errorChristian Couder2016-08-011-11/+30
| * builtin/apply: make write_out_results() return -1 on errorChristian Couder2016-08-011-6/+21
| * builtin/apply: make write_out_one_result() return -1 on errorChristian Couder2016-08-011-22/+16
| * builtin/apply: make create_file() return -1 on errorChristian Couder2016-08-011-12/+13
| * builtin/apply: make add_index_file() return -1 on errorChristian Couder2016-08-011-17/+31
| * builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder2016-08-011-7/+13
| * builtin/apply: make remove_file() return -1 on errorChristian Couder2016-08-011-6/+11
| * builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder2016-08-011-15/+26
| * builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder2016-08-011-11/+21
| * builtin/apply: make gitdiff_*() return -1 on errorChristian Couder2016-08-011-19/+21
| * builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder2016-08-011-3/+9
| * builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder2016-08-011-6/+9
| * builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder2016-08-011-11/+26
| * builtin/apply: move check_apply_state() to apply.cChristian Couder2016-08-013-32/+33
| * builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder2016-08-011-8/+11
| * apply: make init_apply_state() return -1 instead of exit()ingChristian Couder2016-08-013-9/+11
| * builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-014-91/+105
| * builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die(...Christian Couder2016-08-011-7/+7
| * builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder2016-08-011-11/+12
| * builtin/apply: make parse_single_patch() return -1 on errorChristian Couder2016-08-012-6/+15
| * builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder2016-08-011-8/+14
| * builtin/apply: make find_header() return -128 instead of die()ingChristian Couder2016-08-012-13/+29
| * builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder2016-08-011-3/+5
| * builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder2016-08-011-15/+45
| * apply: move 'struct apply_state' to apply.hChristian Couder2016-08-012-97/+101
View Lorry Controller Status