summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)AuthorFilesLines
2017-09-10Merge branch 'rs/apply-lose-prefix-length' into maintLibravatar Junio C Hamano1-7/+5
2017-09-10Merge branch 'tb/apply-with-crlf' into maintLibravatar Junio C Hamano1-5/+36
2017-08-19apply: file commited with CRLF should roundtrip diff and applyLibravatar Torsten Bögershausen1-5/+36
2017-08-09apply: remove prefix_length member from apply_stateLibravatar René Scharfe1-7/+5
2017-07-17apply: use COPY_ARRAY and MOVE_ARRAY in update_image()Libravatar René Scharfe1-7/+4
2017-07-12Merge branch 'rs/apply-avoid-over-reading'Libravatar Junio C Hamano1-2/+1
2017-07-10Merge branch 'ab/wildmatch'Libravatar Junio C Hamano1-1/+1
2017-07-09apply: use strcmp(3) for comparing strings in gitdiff_verify_name()Libravatar René Scharfe1-2/+1
2017-07-06Merge branch 'rs/apply-avoid-over-reading'Libravatar Junio C Hamano1-2/+1
2017-07-01apply: use starts_with() in gitdiff_verify_name()Libravatar René Scharfe1-2/+1
2017-06-30Merge branch 'rs/apply-validate-input'Libravatar Junio C Hamano1-6/+29
2017-06-27apply: check git diffs for mutually exclusive header linesLibravatar René Scharfe1-0/+15
2017-06-27apply: check git diffs for invalid file modesLibravatar René Scharfe1-5/+12
2017-06-27apply: check git diffs for missing old filenamesLibravatar René Scharfe1-1/+2
2017-06-24Merge branch 'ab/free-and-null'Libravatar Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Libravatar Junio C Hamano1-1/+1
2017-06-23wildmatch: remove unused wildopts parameterLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2017-06-22Merge branch 'pc/dir-count-slashes'Libravatar Junio C Hamano1-11/+0
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleLibravatar Ævar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'jc/noent-notdir'Libravatar Junio C Hamano1-1/+1
2017-06-13convert: convert convert_to_git to take an indexLibravatar Brandon Williams1-1/+1
2017-06-12dir: create function count_slashes()Libravatar Prathamesh Chavan1-11/+0
2017-05-30treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedLibravatar Junio C Hamano1-1/+1
2017-05-16Merge branch 'jc/apply-fix-mismerge'Libravatar Junio C Hamano1-169/+169
2017-05-08apply.c: fix whitespace-only mismergeLibravatar Junio C Hamano1-169/+169
2017-03-21prefix_filename: return newly allocated stringLibravatar Jeff King1-3/+6
2017-03-21prefix_filename: drop length parameterLibravatar Jeff King1-4/+2
2017-01-30apply: use SWAP macroLibravatar René Scharfe1-16/+7
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Libravatar Junio C Hamano1-1/+1
2016-10-17i18n: apply: mark error message for translationLibravatar Vasco Almeida1-2/+2
2016-10-14i18n: apply: mark error messages for translationLibravatar Vasco Almeida1-24/+24
2016-10-14i18n: apply: mark info messages for translationLibravatar Vasco Almeida1-4/+4
2016-10-14i18n: apply: mark plural string for translationLibravatar Vasco Almeida1-4/+6
2016-09-22introduce CHECKOUT_INITLibravatar René Scharfe1-3/+1
2016-09-19Merge branch 'bc/object-id'Libravatar Junio C Hamano1-215/+215
2016-09-07apply: learn to use a different index fileLibravatar Christian Couder1-6/+21
2016-09-07apply: pass apply state to build_fake_ancestor()Libravatar Christian Couder1-4/+5
2016-09-07apply: move libified code from builtin/apply.c to apply.{c,h}Libravatar Christian Couder1-0/+4731
2016-09-07apply: refactor `git apply` option parsingLibravatar Christian Couder1-13/+90
2016-09-07apply: change error_routine when silentLibravatar Christian Couder1-1/+20
2016-09-07apply: don't print on stdout in verbosity_silent modeLibravatar Christian Couder1-3/+3
2016-09-07apply: make it possible to silently applyLibravatar Christian Couder1-22/+40
2016-09-07apply: use error_errno() where possibleLibravatar Christian Couder1-8/+8
2016-09-07apply: make some parsing functions static againLibravatar Christian Couder1-3/+3
2016-08-11builtin/apply: move check_apply_state() to apply.cLibravatar Christian Couder1-0/+32
2016-08-11apply: make init_apply_state() return -1 instead of exit()ingLibravatar Christian Couder1-5/+6
2016-08-11builtin/apply: move init_apply_state() to apply.cLibravatar Christian Couder1-0/+94
2006-05-23Builtin git-apply.Libravatar Peter Eriksen1-2299/+0