summaryrefslogtreecommitdiffstats
path: root/apply.c
AgeCommit message (Expand)AuthorLines
2017-09-10Merge branch 'rs/apply-lose-prefix-length' into maintJunio C Hamano-7/+5
2017-09-10Merge branch 'tb/apply-with-crlf' into maintJunio C Hamano-5/+36
2017-08-19apply: file commited with CRLF should roundtrip diff and applyTorsten Bögershausen-5/+36
2017-08-09apply: remove prefix_length member from apply_stateRené Scharfe-7/+5
2017-07-17apply: use COPY_ARRAY and MOVE_ARRAY in update_image()René Scharfe-7/+4
2017-07-12Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano-2/+1
2017-07-10Merge branch 'ab/wildmatch'Junio C Hamano-1/+1
2017-07-09apply: use strcmp(3) for comparing strings in gitdiff_verify_name()René Scharfe-2/+1
2017-07-06Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano-2/+1
2017-07-01apply: use starts_with() in gitdiff_verify_name()René Scharfe-2/+1
2017-06-30Merge branch 'rs/apply-validate-input'Junio C Hamano-6/+29
2017-06-27apply: check git diffs for mutually exclusive header linesRené Scharfe-0/+15
2017-06-27apply: check git diffs for invalid file modesRené Scharfe-5/+12
2017-06-27apply: check git diffs for missing old filenamesRené Scharfe-1/+2
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano-2/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano-0/+1
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano-1/+1
2017-06-23wildmatch: remove unused wildopts parameterÆvar Arnfjörð Bjarmason-1/+1
2017-06-22Merge branch 'pc/dir-count-slashes'Junio C Hamano-11/+0
2017-06-16coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason-2/+1
2017-06-15config: don't include config.h by defaultBrandon Williams-0/+1
2017-06-13Merge branch 'jc/noent-notdir'Junio C Hamano-1/+1
2017-06-13convert: convert convert_to_git to take an indexBrandon Williams-1/+1
2017-06-12dir: create function count_slashes()Prathamesh Chavan-11/+0
2017-05-30treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedJunio C Hamano-1/+1
2017-05-16Merge branch 'jc/apply-fix-mismerge'Junio C Hamano-169/+169
2017-05-08apply.c: fix whitespace-only mismergeJunio C Hamano-169/+169
2017-03-21prefix_filename: return newly allocated stringJeff King-3/+6
2017-03-21prefix_filename: drop length parameterJeff King-4/+2
2017-01-30apply: use SWAP macroRené Scharfe-16/+7
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano-1/+1
2016-10-17i18n: apply: mark error message for translationVasco Almeida-2/+2
2016-10-14i18n: apply: mark error messages for translationVasco Almeida-24/+24
2016-10-14i18n: apply: mark info messages for translationVasco Almeida-4/+4
2016-10-14i18n: apply: mark plural string for translationVasco Almeida-4/+6
2016-09-22introduce CHECKOUT_INITRené Scharfe-3/+1
2016-09-19Merge branch 'bc/object-id'Junio C Hamano-215/+215
2016-09-07apply: learn to use a different index fileChristian Couder-6/+21
2016-09-07apply: pass apply state to build_fake_ancestor()Christian Couder-4/+5
2016-09-07apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder-0/+4731
2016-09-07apply: refactor `git apply` option parsingChristian Couder-13/+90
2016-09-07apply: change error_routine when silentChristian Couder-1/+20
2016-09-07apply: don't print on stdout in verbosity_silent modeChristian Couder-3/+3
2016-09-07apply: make it possible to silently applyChristian Couder-22/+40
2016-09-07apply: use error_errno() where possibleChristian Couder-8/+8
2016-09-07apply: make some parsing functions static againChristian Couder-3/+3
2016-08-11builtin/apply: move check_apply_state() to apply.cChristian Couder-0/+32
2016-08-11apply: make init_apply_state() return -1 instead of exit()ingChristian Couder-5/+6
2016-08-11builtin/apply: move init_apply_state() to apply.cChristian Couder-0/+94
2006-05-23Builtin git-apply.Peter Eriksen-2299/+0