Age | Commit message (Expand) | Author | Files | Lines |
2013-07-15 | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint | Junio C Hamano | 1 | -1/+1 |
2013-07-09 | Convert "struct cache_entry *" to "const ..." wherever possible | Nguyễn Thái Ngọc Duy | 1 | -6/+7 |
2013-06-26 | Merge branch 'tr/maint-apply-non-git-patch-parsefix' | Junio C Hamano | 1 | -1/+1 |
2013-06-21 | apply: carefully strdup a possibly-NULL name | Thomas Rast | 1 | -1/+1 |
2013-06-13 | use logical OR (||) instead of binary OR (|) in logical context | René Scharfe | 1 | -1/+1 |
2013-04-12 | Sync with 'maint' | Junio C Hamano | 1 | -3/+3 |
2013-04-12 | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 1 | -3/+3 |
2013-04-03 | Merge branch 'jc/apply-ws-fix-tab-in-indent' | Junio C Hamano | 1 | -6/+10 |
2013-03-22 | apply --whitespace=fix: avoid running over the postimage buffer | Junio C Hamano | 1 | -6/+10 |
2013-02-14 | Merge branch 'jc/extended-fake-ancestor-for-gitlink' | Junio C Hamano | 1 | -2/+38 |
2013-02-08 | Merge branch 'jk/apply-similaritly-parsing' | Junio C Hamano | 1 | -4/+6 |
2013-02-05 | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 1 | -14/+16 |
2013-02-05 | apply: verify submodule commit object name better | Junio C Hamano | 1 | -2/+38 |
2013-02-03 | builtin/apply: tighten (dis)similarity index parsing | John Keeping | 1 | -4/+6 |
2013-01-31 | apply: diagnose incomplete submodule object name better | Junio C Hamano | 1 | -1/+5 |
2013-01-31 | apply: simplify build_fake_ancestor() | Junio C Hamano | 1 | -14/+12 |
2013-01-06 | Merge branch 'jc/apply-trailing-blank-removal' | Junio C Hamano | 1 | -6/+17 |
2012-10-12 | apply.c:update_pre_post_images(): the preimage can be truncated | Junio C Hamano | 1 | -6/+17 |
2012-09-12 | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 1 | -25/+43 |
2012-09-12 | Merge branch 'jc/apply-binary-p0' into maint-1.7.11 | Junio C Hamano | 1 | -25/+43 |
2012-09-11 | Sync with 1.7.11.6 | Junio C Hamano | 1 | -1/+0 |
2012-09-11 | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11 | Junio C Hamano | 1 | -1/+0 |
2012-09-07 | Merge branch 'jc/apply-binary-p0' | Junio C Hamano | 1 | -25/+43 |
2012-09-07 | Merge branch 'nd/i18n-parseopt-help' | Junio C Hamano | 1 | -1/+1 |
2012-08-24 | apply: compute patch->def_name correctly under -p0 | Junio C Hamano | 1 | -25/+43 |
2012-08-22 | Use imperative form in help usage to describe an action | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2012-08-22 | Merge branch 'pg/maint-apply-remove-unused-variable' | Junio C Hamano | 1 | -1/+0 |
2012-08-05 | apply: delete unused deflate_origlen from patch struct | Paul Gortmaker | 1 | -1/+0 |
2012-07-23 | Merge branch 'tg/ce-namelen-field' | Junio C Hamano | 1 | -2/+4 |
2012-07-22 | Merge branch 'jc/sha1-name-more' | Junio C Hamano | 1 | -1/+1 |
2012-07-15 | Merge branch 'jc/apply-3way' | Junio C Hamano | 1 | -117/+440 |
2012-07-11 | Strip namelen out of ce_flags into a ce_namelen field | Thomas Gummerer | 1 | -1/+2 |
2012-07-09 | apply: --build-fake-ancestor expects blobs | Junio C Hamano | 1 | -1/+1 |
2012-07-09 | apply: allow rerere() to work on --3way results | Junio C Hamano | 1 | -0/+3 |
2012-07-09 | apply: register conflicted stages to the index | Junio C Hamano | 1 | -6/+60 |
2012-07-09 | apply: --3way with add/add conflict | Junio C Hamano | 1 | -8/+62 |
2012-07-09 | apply: move verify_index_match() higher | Junio C Hamano | 1 | -10/+10 |
2012-07-09 | apply: plug the three-way merge logic in | Junio C Hamano | 1 | -3/+50 |
2012-07-09 | apply: fall back on three-way merge | Junio C Hamano | 1 | -1/+45 |
2012-07-09 | apply: accept -3/--3way command line option | Junio C Hamano | 1 | -2/+23 |
2012-07-09 | apply: move "already exists" logic to check_to_create() | Junio C Hamano | 1 | -11/+29 |
2012-07-09 | apply: move check_to_create_blob() closer to its sole caller | Junio C Hamano | 1 | -23/+23 |
2012-07-09 | apply: further split load_preimage() | Junio C Hamano | 1 | -19/+40 |
2012-07-09 | apply: refactor "previous patch" logic | Junio C Hamano | 1 | -26/+56 |
2012-07-09 | apply: split load_preimage() helper function out | Junio C Hamano | 1 | -3/+12 |
2012-07-09 | apply: factor out checkout_target() helper function | Junio C Hamano | 1 | -7/+13 |
2012-07-09 | apply: refactor read_file_or_gitlink() | Junio C Hamano | 1 | -7/+11 |
2012-07-09 | apply: clear_image() clears things a bit more | Junio C Hamano | 1 | -2/+2 |
2012-07-09 | apply: a bit more comments on PATH_TO_BE_DELETED | Junio C Hamano | 1 | -2/+8 |
2012-07-09 | apply: fix an incomplete comment in check_patch() | Junio C Hamano | 1 | -9/+15 |