aboutsummaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano2013-02-14
|\
| * apply: verify submodule commit object name betterJunio C Hamano2013-02-05
* | Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-08
|\ \
| * | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-03
| * | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-12
| |\ \
| * \ \ Sync with 1.7.11.6Junio C Hamano2012-09-11
| |\ \ \
* | \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-05
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-31
| * | | | apply: simplify build_fake_ancestor()Junio C Hamano2013-01-31
* | | | | Merge branch 'jc/apply-trailing-blank-removal'Junio C Hamano2013-01-06
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-12
| | |_|/ | |/| |
| * | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-12
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \
* | \ \ \ Merge branch 'jc/apply-binary-p0'Junio C Hamano2012-09-07
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-24
* | | | | Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-07
|\ \ \ \ \
| * | | | | Use imperative form in help usage to describe an actionNguyễn Thái Ngọc Duy2012-08-22
| | |_|_|/ | |/| | |
* | | | | Merge branch 'pg/maint-apply-remove-unused-variable'Junio C Hamano2012-08-22
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | apply: delete unused deflate_origlen from patch structPaul Gortmaker2012-08-05
* | | | Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-23
|\ \ \ \
| * | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-11
| | |_|/ | |/| |
* | | | Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-22
|\ \ \ \
| * | | | apply: --build-fake-ancestor expects blobsJunio C Hamano2012-07-09
| | |_|/ | |/| |
* | | | Merge branch 'jc/apply-3way'Junio C Hamano2012-07-15
|\ \ \ \ | |_|/ / |/| | |
| * | | apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-09
| * | | apply: register conflicted stages to the indexJunio C Hamano2012-07-09
| * | | apply: --3way with add/add conflictJunio C Hamano2012-07-09
| * | | apply: move verify_index_match() higherJunio C Hamano2012-07-09
| * | | apply: plug the three-way merge logic inJunio C Hamano2012-07-09
| * | | apply: fall back on three-way mergeJunio C Hamano2012-07-09
| * | | apply: accept -3/--3way command line optionJunio C Hamano2012-07-09
| * | | apply: move "already exists" logic to check_to_create()Junio C Hamano2012-07-09
| * | | apply: move check_to_create_blob() closer to its sole callerJunio C Hamano2012-07-09
| * | | apply: further split load_preimage()Junio C Hamano2012-07-09
| * | | apply: refactor "previous patch" logicJunio C Hamano2012-07-09
| * | | apply: split load_preimage() helper function outJunio C Hamano2012-07-09
| * | | apply: factor out checkout_target() helper functionJunio C Hamano2012-07-09
| * | | apply: refactor read_file_or_gitlink()Junio C Hamano2012-07-09
| * | | apply: clear_image() clears things a bit moreJunio C Hamano2012-07-09
| * | | apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano2012-07-09
| * | | apply: fix an incomplete comment in check_patch()Junio C Hamano2012-07-09
* | | | i18n: apply: split to fix a partial i18n messageJiang Xin2012-06-01
* | | | Merge branch 'nd/i18n-parseopt'Junio C Hamano2012-05-17
|\ \ \ \
| * | | | i18n: apply: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-05-08
| |/ / /
* | | | apply: remove lego in i18n string in gitdiff_verify_nameNguyễn Thái Ngọc Duy2012-05-08
|/ / /
* | | Merge branch 'nd/i18n'Junio C Hamano2012-05-02
|\ \ \
| * | | i18n: apply: update say_patch_name to give translators complete sentenceNguyễn Thái Ngọc Duy2012-04-24
| * | | i18n: apply: mark strings for translationNguyễn Thái Ngọc Duy2012-04-24
* | | | Merge branch 'jh/apply-free-patch'Junio C Hamano2012-04-23
|\ \ \ \ | |/ / / |/| | |
| * | | apply: document buffer ownership rules across functionsJunio C Hamano2012-04-11