summaryrefslogtreecommitdiff
path: root/apply.c
AgeCommit message (Expand)AuthorFilesLines
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
2006-05-17apply --cached: do not check newly added file in the working treeLibravatar Junio C Hamano1-4/+6
2006-05-15apply --cached: apply a patch without using working tree.Libravatar Junio C Hamano1-20/+52
2006-05-15apply --numstat: show new name, not old name.Libravatar Junio C Hamano1-1/+1
2006-05-09Merge branch 'jc/bindiff'Libravatar Junio C Hamano1-61/+237
2006-05-09apply: fix infinite loop with multiple patches with --indexLibravatar Eric Wong1-9/+9
2006-05-05binary diff: further updates.Libravatar Junio C Hamano1-33/+97
2006-05-05binary patch.Libravatar Junio C Hamano1-60/+172
2006-04-10Implement limited context matching in git-apply.Libravatar Eric W. Biederman1-18/+105
2006-04-04Replace xmalloc+memset(0) with xcalloc.Libravatar Peter Eriksen1-6/+3
2006-04-04Use blob_, commit_, tag_, and tree_type throughout.Libravatar Peter Eriksen1-2/+3
2006-03-25git-apply: safety fixesLibravatar Linus Torvalds1-1/+3
2006-03-22git-apply: do not barf when updating an originally empty file.Libravatar Junio C Hamano1-1/+1
2006-03-09Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))Libravatar Junio C Hamano1-1/+1
2006-03-05Add --temp and --stage=all options to checkout-index.Libravatar Shawn Pearce1-1/+2
2006-03-02war on whitespaces: documentation.Libravatar Junio C Hamano1-1/+1
2006-02-28git-apply: war on whitespace -- finishing touches.Libravatar Junio C Hamano1-0/+11
2006-02-27git-apply --whitespace=nowarnLibravatar Junio C Hamano1-2/+6
2006-02-27apply --whitespace: configuration option.Libravatar Junio C Hamano1-24/+48
2006-02-27apply: squelch excessive errors and --whitespace=error-allLibravatar Junio C Hamano1-8/+45
2006-02-26apply --whitespace fixes and enhancements.Libravatar Junio C Hamano1-23/+54
2006-02-26The war on trailing whitespaceLibravatar Linus Torvalds1-0/+33
2006-02-21Merge branch 'jc/nostat'Libravatar Junio C Hamano1-1/+1
2006-02-17Optionally support old diffsLibravatar Johannes Schindelin1-0/+8
2006-02-08"Assume unchanged" gitLibravatar Junio C Hamano1-1/+1
2006-02-03Use sha1_file.c's mkdir-like routine in apply.c.Libravatar Jason Riedy1-21/+4