summaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/apply-validate-input'Junio C Hamano2017-06-301-6/+29
|\
| * apply: check git diffs for mutually exclusive header linesrs/apply-validate-inputRené 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 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\ \
| * | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-1/+1
|\ \ \ \
| * | | | convert: convert convert_to_git to take an indexBrandon Williams2017-06-131-1/+1
* | | | | Merge branch 'pc/dir-count-slashes'Junio C Hamano2017-06-221-11/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | dir: create function count_slashes()pc/dir-count-slashesPrathamesh Chavan2017-06-121-11/+0
| | |/ / | |/| |
* | | | Merge branch 'jc/noent-notdir'Junio C Hamano2017-06-131-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | treewide: use is_missing_file_error() where ENOENT and ENOTDIR are checkedjc/noent-notdirJunio C Hamano2017-05-301-1/+1
* | | | Merge branch 'jc/apply-fix-mismerge'Junio C Hamano2017-05-161-169/+169
|\ \ \ \ | |_|/ / |/| | |
| * | | apply.c: fix whitespace-only mismergejc/apply-fix-mismergeJunio C Hamano2017-05-081-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_INITrs/checkout-init-macroRené 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-171-4/+6
* apply --cached: apply a patch without using working tree.Junio C Hamano2006-05-151-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-051-33/+97
| * binary patch.Junio C Hamano2006-05-051-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-101-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-251-1/+3
View Lorry Controller Status