| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | update URL to the marc.info mail archive | Ondřej Bílka | 2013-07-22 | 1 | -1/+1 |
| * | apply.c::find_name_traditional(): do not initialize len to the line's length | Stefan Beller | 2013-07-19 | 1 | -1/+1 |
| * | Merge branch 'rs/logical-vs-binary-or' into maint | Junio C Hamano | 2013-07-19 | 1 | -1/+1 |
| |\ | |||||
| | * | use logical OR (||) instead of binary OR (|) in logical context | René Scharfe | 2013-06-13 | 1 | -1/+1 |
| * | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint | Junio C Hamano | 2013-07-15 | 1 | -1/+1 |
| |\ \ | |/ |/| | |||||
| | * | apply: carefully strdup a possibly-NULL name | Thomas Rast | 2013-06-21 | 1 | -1/+1 |
| * | | Sync with 'maint' | Junio C Hamano | 2013-04-12 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 1 | -3/+3 |
| * | | | Merge branch 'jc/apply-ws-fix-tab-in-indent' | Junio C Hamano | 2013-04-03 | 1 | -6/+10 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | apply --whitespace=fix: avoid running over the postimage buffer | Junio C Hamano | 2013-03-22 | 1 | -6/+10 |
| * | | | Merge branch 'jc/extended-fake-ancestor-for-gitlink' | Junio C Hamano | 2013-02-14 | 1 | -2/+38 |
| |\ \ \ | |||||
| | * | | | apply: verify submodule commit object name better | Junio C Hamano | 2013-02-05 | 1 | -2/+38 |
| * | | | | Merge branch 'jk/apply-similaritly-parsing' | Junio C Hamano | 2013-02-08 | 1 | -4/+6 |
| |\ \ \ \ | |||||
| | * | | | | builtin/apply: tighten (dis)similarity index parsing | John Keeping | 2013-02-03 | 1 | -4/+6 |
| | * | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-12 | 1 | -25/+43 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Sync with 1.7.11.6 | Junio C Hamano | 2012-09-11 | 1 | -1/+0 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 2013-02-05 | 1 | -14/+16 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | apply: diagnose incomplete submodule object name better | Junio C Hamano | 2013-01-31 | 1 | -1/+5 |
| | * | | | | | | apply: simplify build_fake_ancestor() | Junio C Hamano | 2013-01-31 | 1 | -14/+12 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge branch 'jc/apply-trailing-blank-removal' | Junio C Hamano | 2013-01-06 | 1 | -6/+17 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | apply.c:update_pre_post_images(): the preimage can be truncated | Junio C Hamano | 2012-10-12 | 1 | -6/+17 |
| | | |_|/ / | |/| | | | |||||
| | * | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -25/+43 |
| | |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -1/+0 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge branch 'jc/apply-binary-p0' | Junio C Hamano | 2012-09-07 | 1 | -25/+43 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | apply: compute patch->def_name correctly under -p0 | Junio C Hamano | 2012-08-24 | 1 | -25/+43 |
| * | | | | | Merge branch 'nd/i18n-parseopt-help' | Junio C Hamano | 2012-09-07 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Use imperative form in help usage to describe an action | Nguyễn Thái Ngọc Duy | 2012-08-22 | 1 | -1/+1 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge branch 'pg/maint-apply-remove-unused-variable' | Junio C Hamano | 2012-08-22 | 1 | -1/+0 |
| |\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| | * | | | apply: delete unused deflate_origlen from patch struct | Paul Gortmaker | 2012-08-05 | 1 | -1/+0 |
| * | | | | Merge branch 'tg/ce-namelen-field' | Junio C Hamano | 2012-07-23 | 1 | -2/+4 |
| |\ \ \ \ | |||||
| | * | | | | Strip namelen out of ce_flags into a ce_namelen field | Thomas Gummerer | 2012-07-11 | 1 | -1/+2 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'jc/sha1-name-more' | Junio C Hamano | 2012-07-22 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | apply: --build-fake-ancestor expects blobs | Junio C Hamano | 2012-07-09 | 1 | -1/+1 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'jc/apply-3way' | Junio C Hamano | 2012-07-15 | 1 | -117/+440 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | 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 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |