summaryrefslogtreecommitdiff
path: root/builtin/apply.c
AgeCommit message (Expand)AuthorFilesLines
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
2012-03-27apply: rename free_patch() to free_patch_list()Libravatar Junio C Hamano1-14/+19
2012-03-07apply: do not leak patches and fragmentsLibravatar Jared Hance1-4/+23
2012-02-03Use correct grammar in diffstat summary lineLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2011-12-21Merge branch 'bc/maint-apply-check-no-patch' into maintLibravatar Junio C Hamano1-5/+5
2011-12-13Merge branch 'bc/maint-apply-check-no-patch'Libravatar Junio C Hamano1-5/+5
2011-12-13Merge branch 'maint-1.7.7' into maintLibravatar Junio C Hamano1-3/+0
2011-12-13Merge branch 'ab/clang-lints' into maint-1.7.7Libravatar Junio C Hamano1-3/+0
2011-12-05Merge branch 'ab/clang-lints'Libravatar Junio C Hamano1-3/+0
2011-12-05builtin/apply.c: report error on failure to recognize inputLibravatar Brandon Casey1-5/+5
2011-11-06apply: get rid of useless x < 0 comparison on a size_t typeLibravatar Ævar Arnfjörð Bjarmason1-3/+0
2011-10-21Merge branch 'jc/apply-blank-at-eof-fix' into maintLibravatar Junio C Hamano1-2/+9
2011-10-21Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintLibravatar Junio C Hamano1-0/+3
2011-10-19Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Libravatar Junio C Hamano1-0/+3
2011-10-13Merge branch 'jc/apply-blank-at-eof-fix'Libravatar Junio C Hamano1-2/+9
2011-10-12fix "git apply --index ..." not to deref NULLLibravatar Jim Meyering1-0/+3
2011-09-28apply: use OPT_NOOP_NOARGLibravatar René Scharfe1-7/+2
2011-06-10zlib: zlib can only process 4GB at a timeLibravatar Junio C Hamano1-1/+1
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintLibravatar Junio C Hamano1-3/+6
2011-04-29"add -p": work-around an old laziness that does not coalesce hunksLibravatar Junio C Hamano1-3/+6
2011-03-15Merge branch 'jc/maint-apply-report-offset'Libravatar Junio C Hamano1-2/+14
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 02:55:11 +0000