summaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-3/+3
|\
| * i18n: standardise messagesVasco Almeida2016-06-171-3/+3
* | Merge branch 'jk/string-list-static-init'Junio C Hamano2016-07-061-0/+3
|\ \
| * | use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-131-3/+3
| |/
* | Merge branch 'cc/apply-introduce-state'Junio C Hamano2016-06-271-609/+820
|\ \
| * | builtin/apply: remove misleading comment on lock_file fieldcc/apply-introduce-stateJunio C Hamano2016-06-061-4/+1
| * | builtin/apply: move 'newfd' global into 'struct apply_state'Christian Couder2016-06-031-4/+5
| * | builtin/apply: add 'lock_file' pointer into 'struct apply_state'Christian Couder2016-06-031-4/+15
| * | builtin/apply: move applying patches into apply_all_patches()Christian Couder2016-06-011-58/+71
| * | builtin/apply: move 'state' check into check_apply_state()Christian Couder2016-06-011-23/+29
| * | builtin/apply: move 'symlink_changes' global into 'struct apply_state'Christian Couder2016-06-011-22/+28
| * | builtin/apply: move 'fn_table' global into 'struct apply_state'Christian Couder2016-06-011-22/+25
| * | builtin/apply: move 'state_linenr' global into 'struct apply_state'Christian Couder2016-06-011-35/+36
| * | builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'Christian Couder2016-06-011-24/+25
| * | builtin/apply: move 'ws_ignore_action' into 'struct apply_state'Christian Couder2016-06-011-17/+20
| * | builtin/apply: move 'ws_error_action' into 'struct apply_state'Christian Couder2016-06-011-28/+33
| * | builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'Christian Couder2016-06-011-5/+5
| * | builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'Christian Couder2016-06-011-11/+11
| * | builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()Christian Couder2016-06-011-5/+4
| * | builtin/apply: move 'whitespace_option' into 'struct apply_state'Christian Couder2016-06-011-7/+6
| * | builtin/apply: move 'whitespace_error' global into 'struct apply_state'Christian Couder2016-06-011-13/+15
| * | builtin/apply: move 'root' global into 'struct apply_state'Christian Couder2016-06-011-33/+49
| * | builtin/apply: move 'p_value_known' global into 'struct apply_state'Christian Couder2016-06-011-5/+4
| * | builtin/apply: move 'p_value' global into 'struct apply_state'Christian Couder2016-06-011-52/+99
| * | builtin/apply: move 'has_include' global into 'struct apply_state'Christian Couder2016-06-011-3/+3
| * | builtin/apply: move 'limit_by_name' global into 'struct apply_state'Christian Couder2016-06-011-10/+16
| * | builtin/apply: move 'patch_input_file' global into 'struct apply_state'Christian Couder2016-06-011-10/+17
| * | builtin/apply: move 'apply' global into 'struct apply_state'Christian Couder2016-06-011-14/+17
| * | builtin/apply: move 'p_context' global into 'struct apply_state'Christian Couder2016-06-011-3/+4
| * | builtin/apply: move 'fake_ancestor' global into 'struct apply_state'Christian Couder2016-06-011-8/+5
| * | builtin/apply: move 'line_termination' global into 'struct apply_state'Christian Couder2016-06-011-5/+9
| * | builtin/apply: move 'unsafe_paths' global into 'struct apply_state'Christian Couder2016-06-011-4/+4
| * | builtin/apply: move 'no_add' global into 'struct apply_state'Christian Couder2016-06-011-3/+3
| * | builtin/apply: move 'threeway' global into 'struct apply_state'Christian Couder2016-06-011-7/+7
| * | builtin/apply: move 'summary' global into 'struct apply_state'Christian Couder2016-06-011-4/+4
| * | builtin/apply: move 'numstat' global into 'struct apply_state'Christian Couder2016-06-011-5/+4
| * | builtin/apply: move 'diffstat' global into 'struct apply_state'Christian Couder2016-06-011-5/+6
| * | builtin/apply: move 'cached' global into 'struct apply_state'Christian Couder2016-06-011-16/+19
| * | builtin/apply: move 'allow_overlap' global into 'struct apply_state'Christian Couder2016-06-011-5/+6
| * | builtin/apply: move 'update_index' global into 'struct apply_state'Christian Couder2016-06-011-19/+26
| * | builtin/apply: move 'apply_verbosely' global into 'struct apply_state'Christian Couder2016-06-011-13/+13
| * | builtin/apply: move 'apply_with_reject' global into 'struct apply_state'Christian Couder2016-06-011-7/+7
| * | builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'Christian Couder2016-06-011-19/+31
| * | builtin/apply: move 'check_index' global into 'struct apply_state'Christian Couder2016-06-011-29/+37
| * | builtin/apply: move 'check' global into 'struct apply_state'Christian Couder2016-06-011-7/+7
| * | builtin/apply: move 'unidiff_zero' global into 'struct apply_state'Christian Couder2016-06-011-18/+25
| * | builtin/apply: move 'state' init into init_apply_state()Christian Couder2016-06-011-10/+22
| * | builtin/apply: introduce 'struct apply_state' to start libifyingChristian Couder2016-05-121-38/+56
| * | builtin/apply: move 'read_stdin' global into cmd_apply()Christian Couder2016-05-121-1/+1
| * | builtin/apply: move 'options' variable into cmd_apply()Christian Couder2016-05-121-1/+1
View Lorry Controller Status