summaryrefslogtreecommitdiff
path: root/builtin/apply.c
AgeCommit message (Expand)Author
2012-07-24Merge branch 'tg/ce-namelen-field'Junio C Hamano
2012-07-22Merge branch 'jc/sha1-name-more'Junio C Hamano
2012-07-16Merge branch 'jc/apply-3way'Junio C Hamano
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer
2012-07-09apply: --build-fake-ancestor expects blobsJunio C Hamano
2012-07-09apply: allow rerere() to work on --3way resultsJunio C Hamano
2012-07-09apply: register conflicted stages to the indexJunio C Hamano
2012-07-09apply: --3way with add/add conflictJunio C Hamano
2012-07-09apply: move verify_index_match() higherJunio C Hamano
2012-07-09apply: plug the three-way merge logic inJunio C Hamano
2012-07-09apply: fall back on three-way mergeJunio C Hamano
2012-07-09apply: accept -3/--3way command line optionJunio C Hamano
2012-07-09apply: move "already exists" logic to check_to_create()Junio C Hamano
2012-07-09apply: move check_to_create_blob() closer to its sole callerJunio C Hamano
2012-07-09apply: further split load_preimage()Junio C Hamano
2012-07-09apply: refactor "previous patch" logicJunio C Hamano
2012-07-09apply: split load_preimage() helper function outJunio C Hamano
2012-07-09apply: factor out checkout_target() helper functionJunio C Hamano
2012-07-09apply: refactor read_file_or_gitlink()Junio C Hamano
2012-07-09apply: clear_image() clears things a bit moreJunio C Hamano
2012-07-09apply: a bit more comments on PATH_TO_BE_DELETEDJunio C Hamano
2012-07-09apply: fix an incomplete comment in check_patch()Junio C Hamano
2012-06-01i18n: apply: split to fix a partial i18n messageJiang Xin
2012-05-17Merge branch 'nd/i18n-parseopt'Junio C Hamano
2012-05-08i18n: apply: mark parseopt strings for translationNguyễn Thái Ngọc Duy
2012-05-08apply: remove lego in i18n string in gitdiff_verify_nameNguyễn Thái Ngọc Duy
2012-05-02Merge branch 'nd/i18n'Junio C Hamano
2012-04-24i18n: apply: update say_patch_name to give translators complete sentenceNguyễn Thái Ngọc Duy
2012-04-24i18n: apply: mark strings for translationNguyễn Thái Ngọc Duy
2012-04-23Merge branch 'jh/apply-free-patch'Junio C Hamano
2012-04-11apply: document buffer ownership rules across functionsJunio C Hamano
2012-04-11apply: tighten constness of line bufferJunio C Hamano
2012-04-11apply: drop unused macroJunio C Hamano
2012-03-29apply: free unused fragments for submodule patchJunio C Hamano
2012-03-27apply: free patch->resultJunio C Hamano
2012-03-27apply: release memory for fn_tableJunio C Hamano
2012-03-27apply: free patch->{def,old,new}_name fieldsJunio C Hamano
2012-03-27apply: rename free_patch() to free_patch_list()Junio C Hamano
2012-03-07apply: do not leak patches and fragmentsJared Hance
2012-02-04Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy
2011-12-21Merge branch 'bc/maint-apply-check-no-patch' into maintJunio C Hamano
2011-12-14Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano
2011-12-14Merge branch 'maint-1.7.7' into maintJunio C Hamano
2011-12-14Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano
2011-12-05Merge branch 'ab/clang-lints'Junio C Hamano
2011-12-05builtin/apply.c: report error on failure to recognize inputBrandon Casey
2011-11-06apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason
2011-10-21Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano
2011-10-21Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano
2011-10-19Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano