| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | apply: allow rerere() to work on --3way results | Junio C Hamano | 2012-07-09 | 1 | -0/+3 | |
| | * | | | apply: register conflicted stages to the index | Junio C Hamano | 2012-07-09 | 1 | -6/+60 | |
| | * | | | apply: --3way with add/add conflict | Junio C Hamano | 2012-07-09 | 1 | -8/+62 | |
| | * | | | apply: move verify_index_match() higher | Junio C Hamano | 2012-07-09 | 1 | -10/+10 | |
| | * | | | apply: plug the three-way merge logic in | Junio C Hamano | 2012-07-09 | 1 | -3/+50 | |
| | * | | | apply: fall back on three-way merge | Junio C Hamano | 2012-07-09 | 1 | -1/+45 | |
| | * | | | apply: accept -3/--3way command line option | Junio C Hamano | 2012-07-09 | 1 | -2/+23 | |
| | * | | | apply: move "already exists" logic to check_to_create() | Junio C Hamano | 2012-07-09 | 1 | -11/+29 | |
| | * | | | apply: move check_to_create_blob() closer to its sole caller | Junio C Hamano | 2012-07-09 | 1 | -23/+23 | |
| | * | | | apply: further split load_preimage() | Junio C Hamano | 2012-07-09 | 1 | -19/+40 | |
| | * | | | apply: refactor "previous patch" logic | Junio C Hamano | 2012-07-09 | 1 | -26/+56 | |
| | * | | | apply: split load_preimage() helper function out | Junio C Hamano | 2012-07-09 | 1 | -3/+12 | |
| | * | | | apply: factor out checkout_target() helper function | Junio C Hamano | 2012-07-09 | 1 | -7/+13 | |
| | * | | | apply: refactor read_file_or_gitlink() | Junio C Hamano | 2012-07-09 | 1 | -7/+11 | |
| | * | | | apply: clear_image() clears things a bit more | Junio C Hamano | 2012-07-09 | 1 | -2/+2 | |
| | * | | | apply: a bit more comments on PATH_TO_BE_DELETED | Junio C Hamano | 2012-07-09 | 1 | -2/+8 | |
| | * | | | apply: fix an incomplete comment in check_patch() | Junio C Hamano | 2012-07-09 | 1 | -9/+15 | |
| * | | | | i18n: apply: split to fix a partial i18n message | Jiang Xin | 2012-06-01 | 1 | -4/+12 | |
| * | | | | Merge branch 'nd/i18n-parseopt' | Junio C Hamano | 2012-05-18 | 1 | -31/+31 | |
| |\ \ \ \ | ||||||
| | * | | | | i18n: apply: mark parseopt strings for translation | Nguyễn Thái Ngọc Duy | 2012-05-08 | 1 | -31/+31 | |
| | |/ / / | ||||||
| * / / / | apply: remove lego in i18n string in gitdiff_verify_name | Nguyễn Thái Ngọc Duy | 2012-05-08 | 1 | -4/+11 | |
| |/ / / | ||||||
| * | | | Merge branch 'nd/i18n' | Junio C Hamano | 2012-05-02 | 1 | -95/+111 | |
| |\ \ \ | ||||||
| | * | | | i18n: apply: update say_patch_name to give translators complete sentence | Nguyễn Thái Ngọc Duy | 2012-04-24 | 1 | -12/+20 | |
| | * | | | i18n: apply: mark strings for translation | Nguyễn Thái Ngọc Duy | 2012-04-24 | 1 | -83/+91 | |
| * | | | | Merge branch 'jh/apply-free-patch' | Junio C Hamano | 2012-04-23 | 1 | -41/+133 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | apply: document buffer ownership rules across functions | Junio C Hamano | 2012-04-11 | 1 | -2/+51 | |
| | * | | | apply: tighten constness of line buffer | Junio C Hamano | 2012-04-11 | 1 | -7/+7 | |
| | * | | | apply: drop unused macro | Junio C Hamano | 2012-04-11 | 1 | -1/+0 | |
| | * | | | apply: free unused fragments for submodule patch | Junio C Hamano | 2012-03-29 | 1 | -9/+15 | |
| | * | | | apply: free patch->result | Junio C Hamano | 2012-03-28 | 1 | -0/+1 | |
| | * | | | apply: release memory for fn_table | Junio C Hamano | 2012-03-28 | 1 | -1/+1 | |
| | * | | | apply: free patch->{def,old,new}_name fields | Junio C Hamano | 2012-03-28 | 1 | -26/+39 | |
| | * | | | apply: rename free_patch() to free_patch_list() | Junio C Hamano | 2012-03-28 | 1 | -14/+19 | |
| | * | | | apply: do not leak patches and fragments | Jared Hance | 2012-03-07 | 1 | -4/+23 | |
| | * | | | Merge branch 'bc/maint-apply-check-no-patch' into maint | Junio C Hamano | 2011-12-21 | 1 | -5/+5 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-14 | 1 | -3/+0 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | Merge branch 'ab/clang-lints' into maint-1.7.7 | Junio C Hamano | 2011-12-14 | 1 | -3/+0 | |
| | | |\ \ \ \ | ||||||
| * | | | | | | | Use correct grammar in diffstat summary line | Nguyễn Thái Ngọc Duy | 2012-02-04 | 1 | -1/+2 | |
| | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | | Merge branch 'bc/maint-apply-check-no-patch' | Junio C Hamano | 2011-12-14 | 1 | -5/+5 | |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | | builtin/apply.c: report error on failure to recognize input | Brandon Casey | 2011-12-05 | 1 | -5/+5 | |
| | | |/ / / | |/| | | | ||||||
| | * | | | | Merge branch 'jc/apply-blank-at-eof-fix' into maint | Junio C Hamano | 2011-10-21 | 1 | -2/+9 | |
| | * | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint | Junio C Hamano | 2011-10-21 | 1 | -0/+3 | |
| | |\ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | | Merge branch 'ab/clang-lints' | Junio C Hamano | 2011-12-06 | 1 | -3/+0 | |
| |\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | ||||||
| | * | | | apply: get rid of useless x < 0 comparison on a size_t type | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -3/+0 | |
| | |/ / | ||||||
| * | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' | Junio C Hamano | 2011-10-19 | 1 | -0/+3 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | fix "git apply --index ..." not to deref NULL | Jim Meyering | 2011-10-12 | 1 | -0/+3 | |
| * | | | Merge branch 'jc/apply-blank-at-eof-fix' | Junio C Hamano | 2011-10-14 | 1 | -2/+9 | |
| * | | | apply: use OPT_NOOP_NOARG | René Scharfe | 2011-09-28 | 1 | -7/+2 | |
| | |/ |/| | ||||||
| * | | zlib: zlib can only process 4GB at a time | Junio C Hamano | 2011-06-10 | 1 | -1/+1 | |
| * | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-17 | 1 | -3/+6 | |
| |\ \ | ||||||
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |