summaryrefslogtreecommitdiffstats
path: root/apply.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano2017-07-311-4/+2
|\
| * apply: use strcmp(3) for comparing strings in gitdiff_verify_name()René Scharfe2017-07-091-2/+1
| * apply: use starts_with() in gitdiff_verify_name()René Scharfe2017-07-011-2/+1
* | Merge branch 'rs/apply-validate-input' into maintJunio C Hamano2017-07-101-6/+29
|\ \
| * | apply: check git diffs for mutually exclusive header linesRené Scharfe2017-06-271-0/+15
| * | apply: check git diffs for invalid file modesRené Scharfe2017-06-271-5/+12
| * | apply: check git diffs for missing old filenamesRené Scharfe2017-06-271-1/+2
* | | Merge branch 'jc/apply-fix-mismerge' into maintJunio C Hamano2017-06-041-169/+169
|\ \ \
| * | | apply.c: fix whitespace-only mismergeJunio C Hamano2017-05-091-169/+169
* | | | prefix_filename: return newly allocated stringJeff King2017-03-211-3/+6
* | | | prefix_filename: drop length parameterJeff King2017-03-211-4/+2
|/ / /
* | | apply: use SWAP macroRené Scharfe2017-01-301-16/+7
* | | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-1/+1
|/ /
* | i18n: apply: mark error message for translationVasco Almeida2016-10-171-2/+2
* | i18n: apply: mark error messages for translationVasco Almeida2016-10-141-24/+24
* | i18n: apply: mark info messages for translationVasco Almeida2016-10-141-4/+4
* | i18n: apply: mark plural string for translationVasco Almeida2016-10-141-4/+6
* | introduce CHECKOUT_INITRené Scharfe2016-09-221-3/+1
* | Merge branch 'bc/object-id'Junio C Hamano2016-09-191-215/+215
|\ \
* | | apply: learn to use a different index fileChristian Couder2016-09-071-6/+21
* | | apply: pass apply state to build_fake_ancestor()Christian Couder2016-09-071-4/+5
* | | apply: refactor `git apply` option parsingChristian Couder2016-09-071-13/+90
* | | apply: change error_routine when silentChristian Couder2016-09-071-1/+20
* | | apply: don't print on stdout in verbosity_silent modeChristian Couder2016-09-071-3/+3
* | | apply: make it possible to silently applyChristian Couder2016-09-071-22/+40
* | | apply: use error_errno() where possibleChristian Couder2016-09-071-8/+8
* | | apply: make some parsing functions static againChristian Couder2016-09-071-3/+3
| |/ |/|
* | apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder2016-09-071-0/+4731
* | builtin/apply: move check_apply_state() to apply.cChristian Couder2016-08-111-0/+32
* | apply: make init_apply_state() return -1 instead of exit()ingChristian Couder2016-08-111-5/+6
* | builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-111-0/+94
|/
* Builtin git-apply.Peter Eriksen2006-05-231-2299/+0
* apply --cached: do not check newly added file in the working treeJunio C Hamano2006-05-181-4/+6
* apply --cached: apply a patch without using working tree.Junio C Hamano2006-05-161-20/+52
* apply --numstat: show new name, not old name.Junio C Hamano2006-05-151-1/+1
* Merge branch 'jc/bindiff'Junio C Hamano2006-05-091-61/+237
|\
| * binary diff: further updates.Junio C Hamano2006-05-061-33/+97
| * binary patch.Junio C Hamano2006-05-061-60/+172
* | apply: fix infinite loop with multiple patches with --indexEric Wong2006-05-091-9/+9
|/
* Implement limited context matching in git-apply.Eric W. Biederman2006-04-111-18/+105
* Replace xmalloc+memset(0) with xcalloc.Peter Eriksen2006-04-041-6/+3
* Use blob_, commit_, tag_, and tree_type throughout.Peter Eriksen2006-04-041-2/+3
* git-apply: safety fixesLinus Torvalds2006-03-261-1/+3
* git-apply: do not barf when updating an originally empty file.Junio C Hamano2006-03-221-1/+1
* Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))Junio C Hamano2006-03-091-1/+1
* Add --temp and --stage=all options to checkout-index.Shawn Pearce2006-03-051-1/+2
* war on whitespaces: documentation.Junio C Hamano2006-03-021-1/+1
* git-apply: war on whitespace -- finishing touches.Junio C Hamano2006-02-281-0/+11
* git-apply --whitespace=nowarnJunio C Hamano2006-02-281-2/+6
* apply --whitespace: configuration option.Junio C Hamano2006-02-271-24/+48