path: root/builtin/apply.c
AgeCommit message (Expand)Author
2013-06-26Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano
2013-06-21apply: carefully strdup a possibly-NULL nameThomas Rast
2013-06-13use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe
2013-04-12Sync with 'maint'Junio C Hamano
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini
2013-04-03Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano
2013-03-22apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano
2013-02-14Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano
2013-02-08Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano
2013-02-06Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano
2013-02-05apply: verify submodule commit object name betterJunio C Hamano
2013-02-03builtin/apply: tighten (dis)similarity index parsingJohn Keeping
2013-02-01apply: diagnose incomplete submodule object name betterJunio C Hamano
2013-02-01apply: simplify build_fake_ancestor()Junio C Hamano
2013-01-07Merge branch 'jc/apply-trailing-blank-removal'Junio C Hamano
2012-10-12apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano
2012-09-12Merge branch 'maint-1.7.11' into maintJunio C Hamano
2012-09-12Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano
2012-09-11Sync with C Hamano
2012-09-11Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano
2012-09-07Merge branch 'jc/apply-binary-p0'Junio C Hamano
2012-09-07Merge branch 'nd/i18n-parseopt-help'Junio C Hamano
2012-08-25apply: compute patch->def_name correctly under -p0Junio C Hamano
2012-08-22Use imperative form in help usage to describe an actionNguyễn Thái Ngọc Duy
2012-08-22Merge branch 'pg/maint-apply-remove-unused-variable'Junio C Hamano
2012-08-05apply: delete unused deflate_origlen from patch structPaul Gortmaker
2012-07-24Merge branch 'tg/ce-namelen-field'Junio C Hamano
2012-07-22Merge branch 'jc/sha1-name-more'Junio C Hamano
2012-07-16Merge branch 'jc/apply-3way'Junio C Hamano
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer
2012-07-09apply: --build-fake-ancestor expects blobsJunio C Hamano
2012-07-09apply: allow rerere() to work on --3way resultsJunio C Hamano
2012-07-09apply: register conflicted stages to the indexJunio C Hamano
2012-07-09apply: --3way with add/add conflictJunio C Hamano
2012-07-09apply: move verify_index_match() higherJunio C Hamano
2012-07-09apply: plug the three-way merge logic inJunio C Hamano
2012-07-09apply: fall back on three-way mergeJunio C Hamano
2012-07-09apply: accept -3/--3way command line optionJunio C Hamano
2012-07-09apply: move "already exists" logic to check_to_create()Junio C Hamano
2012-07-09apply: move check_to_create_blob() closer to its sole callerJunio C Hamano
2012-07-09apply: further split load_preimage()Junio C Hamano
2012-07-09apply: refactor "previous patch" logicJunio C Hamano
2012-07-09apply: split load_preimage() helper function outJunio C Hamano
2012-07-09apply: factor out checkout_target() helper functionJunio C Hamano
2012-07-09apply: refactor read_file_or_gitlink()Junio C Hamano
2012-07-09apply: clear_image() clears things a bit moreJunio C Hamano
2012-07-09apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano
2012-07-09apply: fix an incomplete comment in check_patch()Junio C Hamano
2012-06-01i18n: apply: split to fix a partial i18n messageJiang Xin
2012-05-17Merge branch 'nd/i18n-parseopt'Junio C Hamano