aboutsummaryrefslogtreecommitdiff
path: root/apply.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/apply-fix-mismerge'Junio C Hamano2017-05-16
|\
| * apply.c: fix whitespace-only mismergeJunio C Hamano2017-05-08
* | prefix_filename: return newly allocated stringJeff King2017-03-21
* | prefix_filename: drop length parameterJeff King2017-03-21
|/
* apply: use SWAP macroRené Scharfe2017-01-30
* hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-07
* i18n: apply: mark error message for translationVasco Almeida2016-10-17
* i18n: apply: mark error messages for translationVasco Almeida2016-10-14
* i18n: apply: mark info messages for translationVasco Almeida2016-10-14
* i18n: apply: mark plural string for translationVasco Almeida2016-10-14
* introduce CHECKOUT_INITRené Scharfe2016-09-22
* Merge branch 'bc/object-id'Junio C Hamano2016-09-19
|\
* | apply: learn to use a different index fileChristian Couder2016-09-07
* | apply: pass apply state to build_fake_ancestor()Christian Couder2016-09-07
* | apply: refactor `git apply` option parsingChristian Couder2016-09-07
* | apply: change error_routine when silentChristian Couder2016-09-07
* | apply: don't print on stdout in verbosity_silent modeChristian Couder2016-09-07
* | apply: make it possible to silently applyChristian Couder2016-09-07
* | apply: use error_errno() where possibleChristian Couder2016-09-07
* | apply: make some parsing functions static againChristian Couder2016-09-07
* | apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder2016-09-07
* | builtin/apply: move check_apply_state() to apply.cChristian Couder2016-08-11
* | apply: make init_apply_state() return -1 instead of exit()ingChristian Couder2016-08-11
* | builtin/apply: move init_apply_state() to apply.cChristian Couder2016-08-11
|/
* Builtin git-apply.Peter Eriksen2006-05-23
* apply --cached: do not check newly added file in the working treeJunio C Hamano2006-05-17
* apply --cached: apply a patch without using working tree.Junio C Hamano2006-05-15
* apply --numstat: show new name, not old name.Junio C Hamano2006-05-15
* Merge branch 'jc/bindiff'Junio C Hamano2006-05-09
|\
| * binary diff: further updates.Junio C Hamano2006-05-05
| * binary patch.Junio C Hamano2006-05-05
* | apply: fix infinite loop with multiple patches with --indexEric Wong2006-05-09
|/
* Implement limited context matching in git-apply.Eric W. Biederman2006-04-10
* Replace xmalloc+memset(0) with xcalloc.Peter Eriksen2006-04-04
* Use blob_, commit_, tag_, and tree_type throughout.Peter Eriksen2006-04-04
* git-apply: safety fixesLinus Torvalds2006-03-25
* git-apply: do not barf when updating an originally empty file.Junio C Hamano2006-03-22
* Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))Junio C Hamano2006-03-09
* Add --temp and --stage=all options to checkout-index.Shawn Pearce2006-03-05
* war on whitespaces: documentation.Junio C Hamano2006-03-02
* git-apply: war on whitespace -- finishing touches.Junio C Hamano2006-02-28
* git-apply --whitespace=nowarnJunio C Hamano2006-02-27
* apply --whitespace: configuration option.Junio C Hamano2006-02-27
* apply: squelch excessive errors and --whitespace=error-allJunio C Hamano2006-02-27
* apply --whitespace fixes and enhancements.Junio C Hamano2006-02-26
* The war on trailing whitespaceLinus Torvalds2006-02-26
* Merge branch 'jc/nostat'Junio C Hamano2006-02-21
|\
| * "Assume unchanged" gitJunio C Hamano2006-02-08
* | Optionally support old diffsJohannes Schindelin2006-02-17
|/
* Use sha1_file.c's mkdir-like routine in apply.c.Jason Riedy2006-02-03