aboutsummaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAge
* Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-12
|\
| * Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-12
| |\
| | * apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-24
* | | Sync with 1.7.11.6Junio C Hamano2012-09-11
|\ \ \ | |/ /
| * | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \
| | * | 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
| * | | apply: tighten constness of line bufferJunio C Hamano2012-04-11
| * | | apply: drop unused macroJunio C Hamano2012-04-11
| * | | apply: free unused fragments for submodule patchJunio C Hamano2012-03-28
| * | | apply: free patch->resultJunio C Hamano2012-03-27
| * | | apply: release memory for fn_tableJunio C Hamano2012-03-27
| * | | apply: free patch->{def,old,new}_name fieldsJunio C Hamano2012-03-27
| * | | apply: rename free_patch() to free_patch_list()Junio C Hamano2012-03-27
| * | | apply: do not leak patches and fragmentsJared Hance2012-03-07
| * | | Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano2011-12-21
| |\ \ \
| * \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-13
| |\ \ \ \
| | * \ \ \ Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano2011-12-13
| | |\ \ \ \
* | | | | | | Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy2012-02-03
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano2011-12-13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 18:20:55 +0000