summaryrefslogtreecommitdiff
path: root/builtin/apply.c
AgeCommit message (Expand)AuthorFilesLines
2013-01-31apply: simplify build_fake_ancestor()Libravatar Junio C Hamano1-14/+12
2013-01-06Merge branch 'jc/apply-trailing-blank-removal'Libravatar Junio C Hamano1-6/+17
2012-10-12apply.c:update_pre_post_images(): the preimage can be truncatedLibravatar Junio C Hamano1-6/+17
2012-09-12Merge branch 'maint-1.7.11' into maintLibravatar Junio C Hamano1-25/+43
2012-09-12Merge branch 'jc/apply-binary-p0' into maint-1.7.11Libravatar Junio C Hamano1-25/+43
2012-09-11Sync with 1.7.11.6Libravatar Junio C Hamano1-1/+0
2012-09-11Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Libravatar Junio C Hamano1-1/+0
2012-09-07Merge branch 'jc/apply-binary-p0'Libravatar Junio C Hamano1-25/+43
2012-09-07Merge branch 'nd/i18n-parseopt-help'Libravatar Junio C Hamano1-1/+1
2012-08-24apply: compute patch->def_name correctly under -p0Libravatar Junio C Hamano1-25/+43
2012-08-22Use imperative form in help usage to describe an actionLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2012-08-22Merge branch 'pg/maint-apply-remove-unused-variable'Libravatar Junio C Hamano1-1/+0
2012-08-05apply: delete unused deflate_origlen from patch structLibravatar Paul Gortmaker1-1/+0
2012-07-23Merge branch 'tg/ce-namelen-field'Libravatar Junio C Hamano1-2/+4
2012-07-22Merge branch 'jc/sha1-name-more'Libravatar Junio C Hamano1-1/+1
2012-07-15Merge branch 'jc/apply-3way'Libravatar Junio C Hamano1-117/+440
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldLibravatar Thomas Gummerer1-1/+2
2012-07-09apply: --build-fake-ancestor expects blobsLibravatar Junio C Hamano1-1/+1
2012-07-09apply: allow rerere() to work on --3way resultsLibravatar Junio C Hamano1-0/+3
2012-07-09apply: register conflicted stages to the indexLibravatar Junio C Hamano1-6/+60
2012-07-09apply: --3way with add/add conflictLibravatar Junio C Hamano1-8/+62
2012-07-09apply: move verify_index_match() higherLibravatar Junio C Hamano1-10/+10
2012-07-09apply: plug the three-way merge logic inLibravatar Junio C Hamano1-3/+50
2012-07-09apply: fall back on three-way mergeLibravatar Junio C Hamano1-1/+45
2012-07-09apply: accept -3/--3way command line optionLibravatar Junio C Hamano1-2/+23
2012-07-09apply: move "already exists" logic to check_to_create()Libravatar Junio C Hamano1-11/+29
2012-07-09apply: move check_to_create_blob() closer to its sole callerLibravatar Junio C Hamano1-23/+23
2012-07-09apply: further split load_preimage()Libravatar Junio C Hamano1-19/+40
2012-07-09apply: refactor "previous patch" logicLibravatar Junio C Hamano1-26/+56
2012-07-09apply: split load_preimage() helper function outLibravatar Junio C Hamano1-3/+12
2012-07-09apply: factor out checkout_target() helper functionLibravatar Junio C Hamano1-7/+13
2012-07-09apply: refactor read_file_or_gitlink()Libravatar Junio C Hamano1-7/+11
2012-07-09apply: clear_image() clears things a bit moreLibravatar Junio C Hamano1-2/+2
2012-07-09apply: a bit more comments on PATH_TO_BE_DELETEDLibravatar Junio C Hamano1-2/+8
2012-07-09apply: fix an incomplete comment in check_patch()Libravatar Junio C Hamano1-9/+15
2012-06-01i18n: apply: split to fix a partial i18n messageLibravatar Jiang Xin1-4/+12
2012-05-17Merge branch 'nd/i18n-parseopt'Libravatar Junio C Hamano1-31/+31
2012-05-08i18n: apply: mark parseopt strings for translationLibravatar Nguyễn Thái Ngọc Duy1-31/+31
2012-05-08apply: remove lego in i18n string in gitdiff_verify_nameLibravatar Nguyễn Thái Ngọc Duy1-4/+11
2012-05-02Merge branch 'nd/i18n'Libravatar Junio C Hamano1-95/+111
2012-04-24i18n: apply: update say_patch_name to give translators complete sentenceLibravatar Nguyễn Thái Ngọc Duy1-12/+20
2012-04-24i18n: apply: mark strings for translationLibravatar Nguyễn Thái Ngọc Duy1-83/+91
2012-04-23Merge branch 'jh/apply-free-patch'Libravatar Junio C Hamano1-41/+133
2012-04-11apply: document buffer ownership rules across functionsLibravatar Junio C Hamano1-2/+51
2012-04-11apply: tighten constness of line bufferLibravatar Junio C Hamano1-7/+7
2012-04-11apply: drop unused macroLibravatar Junio C Hamano1-1/+0
2012-03-28apply: free unused fragments for submodule patchLibravatar Junio C Hamano1-9/+15
2012-03-27apply: free patch->resultLibravatar Junio C Hamano1-0/+1
2012-03-27apply: release memory for fn_tableLibravatar Junio C Hamano1-1/+1
2012-03-27apply: free patch->{def,old,new}_name fieldsLibravatar Junio C Hamano1-26/+39
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 18:57:15 +0000