aboutsummaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAge
* 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | builtin/apply.c: report error on failure to recognize inputBrandon Casey2011-12-05
| | |/ / | |/| |
| * | | Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-21
| * | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-21
| |\ \ \
* | \ \ \ Merge branch 'ab/clang-lints'Junio C Hamano2011-12-05
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-06
| |/ /
* | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-19
|\ \ \ | | |/ | |/|
| * | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-12
* | | Merge branch 'jc/apply-blank-at-eof-fix'Junio C Hamano2011-10-13
* | | apply: use OPT_NOOP_NOARGRené Scharfe2011-09-28
| |/ |/|
* | zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-10
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-07 11:38:34 +0000