summaryrefslogtreecommitdiff
path: root/builtin/apply.c
AgeCommit message (Expand)AuthorFilesLines
2012-09-07Merge branch 'nd/i18n-parseopt-help'Junio C Hamano1-1/+1
2012-08-24apply: compute patch->def_name correctly under -p0Junio C Hamano1-25/+43
2012-08-22Use imperative form in help usage to describe an actionNguyễn Thái Ngọc Duy1-1/+1
2012-08-22Merge branch 'pg/maint-apply-remove-unused-variable'Junio C Hamano1-1/+0
2012-08-05apply: delete unused deflate_origlen from patch structPaul Gortmaker1-1/+0
2012-07-23Merge branch 'tg/ce-namelen-field'Junio C Hamano1-2/+4
2012-07-22Merge branch 'jc/sha1-name-more'Junio C Hamano1-1/+1
2012-07-15Merge branch 'jc/apply-3way'Junio C Hamano1-117/+440
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer1-1/+2
2012-07-09apply: --build-fake-ancestor expects blobsJunio C Hamano1-1/+1
2012-07-09apply: allow rerere() to work on --3way resultsJunio C Hamano1-0/+3
2012-07-09apply: register conflicted stages to the indexJunio C Hamano1-6/+60
2012-07-09apply: --3way with add/add conflictJunio C Hamano1-8/+62
2012-07-09apply: move verify_index_match() higherJunio C Hamano1-10/+10
2012-07-09apply: plug the three-way merge logic inJunio C Hamano1-3/+50
2012-07-09apply: fall back on three-way mergeJunio C Hamano1-1/+45
2012-07-09apply: accept -3/--3way command line optionJunio C Hamano1-2/+23
2012-07-09apply: move "already exists" logic to check_to_create()Junio C Hamano1-11/+29
2012-07-09apply: move check_to_create_blob() closer to its sole callerJunio C Hamano1-23/+23
2012-07-09apply: further split load_preimage()Junio C Hamano1-19/+40
2012-07-09apply: refactor "previous patch" logicJunio C Hamano1-26/+56
2012-07-09apply: split load_preimage() helper function outJunio C Hamano1-3/+12
2012-07-09apply: factor out checkout_target() helper functionJunio C Hamano1-7/+13
2012-07-09apply: refactor read_file_or_gitlink()Junio C Hamano1-7/+11
2012-07-09apply: clear_image() clears things a bit moreJunio C Hamano1-2/+2
2012-07-09apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano1-2/+8
2012-07-09apply: fix an incomplete comment in check_patch()Junio C Hamano1-9/+15
2012-06-01i18n: apply: split to fix a partial i18n messageJiang Xin1-4/+12
2012-05-17Merge branch 'nd/i18n-parseopt'Junio C Hamano1-31/+31
2012-05-08i18n: apply: mark parseopt strings for translationNguyễn Thái Ngọc Duy1-31/+31
2012-05-08apply: remove lego in i18n string in gitdiff_verify_nameNguyễn Thái Ngọc Duy1-4/+11
2012-05-02Merge branch 'nd/i18n'Junio C Hamano1-95/+111
2012-04-24i18n: apply: update say_patch_name to give translators complete sentenceNguyễn Thái Ngọc Duy1-12/+20
2012-04-24i18n: apply: mark strings for translationNguyễn Thái Ngọc Duy1-83/+91
2012-04-23Merge branch 'jh/apply-free-patch'Junio C Hamano1-41/+133
2012-04-11apply: document buffer ownership rules across functionsJunio C Hamano1-2/+51
2012-04-11apply: tighten constness of line bufferJunio C Hamano1-7/+7
2012-04-11apply: drop unused macroJunio C Hamano1-1/+0
2012-03-28apply: free unused fragments for submodule patchJunio C Hamano1-9/+15
2012-03-27apply: free patch->resultJunio C Hamano1-0/+1
2012-03-27apply: release memory for fn_tableJunio C Hamano1-1/+1
2012-03-27apply: free patch->{def,old,new}_name fieldsJunio C Hamano1-26/+39
2012-03-27apply: rename free_patch() to free_patch_list()Junio C Hamano1-13/+18
2012-03-07apply: do not leak patches and fragmentsJared Hance1-4/+23
2012-02-03Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy1-1/+2
2011-12-21Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano1-5/+5
2011-12-13Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano1-5/+5
2011-12-13Merge branch 'maint-1.7.7' into maintJunio C Hamano1-3/+0
2011-12-13Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano1-3/+0
2011-12-05Merge branch 'ab/clang-lints'Junio C Hamano1-3/+0
generated by cgit (git 2.54.0.dirty) at 2026-09-14 17:07:49 +0000