summaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Sync with Git 1.8.3.4Junio C Hamano2013-07-221-1/+1
|\
| * update URL to the marc.info mail archiveOndřej Bílka2013-07-221-1/+1
* | Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-6/+7
|\ \
| * | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-6/+7
| * | Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano2013-06-261-1/+1
| |\ \
* | \ \ Merge branch 'tr/do-not-call-submodules-subprojects'Junio C Hamano2013-07-221-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | apply, entry: speak of submodules instead of subprojectsThomas Rast2013-07-181-1/+1
* | | | apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
* | | | Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano2013-07-191-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-131-1/+1
* | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-151-1/+1
|\ \ \ | |/ / |/| / | |/
| * apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-211-1/+1
* | Sync with 'maint'Junio C Hamano2013-04-121-3/+3
|\ \
| * | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-3/+3
* | | Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano2013-04-031-6/+10
|\ \ \ | |/ / |/| |
| * | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-221-6/+10
* | | Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano2013-02-141-2/+38
|\ \ \
| * | | apply: verify submodule commit object name betterJunio C Hamano2013-02-051-2/+38
* | | | Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-081-4/+6
|\ \ \ \
| * | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-031-4/+6
| * | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-121-25/+43
| |\ \ \ \
| * \ \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-111-1/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-051-14/+16
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-311-1/+5
| * | | | | | apply: simplify build_fake_ancestor()Junio C Hamano2013-01-311-14/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/apply-trailing-blank-removal'Junio C Hamano2013-01-061-6/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-121-6/+17
| | |_|/ / | |/| | |
| * | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-121-25/+43
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-111-1/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/apply-binary-p0'Junio C Hamano2012-09-071-25/+43
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | apply: compute patch->def_name correctly under -p0Junio C Hamano2012-08-241-25/+43
* | | | | Merge branch 'nd/i18n-parseopt-help'Junio C Hamano2012-09-071-1/+1
|\ \ \ \ \
| * | | | | Use imperative form in help usage to describe an actionNguyễn Thái Ngọc Duy2012-08-221-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'pg/maint-apply-remove-unused-variable'Junio C Hamano2012-08-221-1/+0
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | apply: delete unused deflate_origlen from patch structPaul Gortmaker2012-08-051-1/+0
* | | | Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-231-2/+4
|\ \ \ \
| * | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-111-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-221-1/+1
|\ \ \ \
| * | | | apply: --build-fake-ancestor expects blobsJunio C Hamano2012-07-091-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'jc/apply-3way'Junio C Hamano2012-07-151-117/+440
|\ \ \ \ | |_|/ / |/| | |
| * | | apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-091-0/+3
| * | | apply: register conflicted stages to the indexJunio C Hamano2012-07-091-6/+60
| * | | apply: --3way with add/add conflictJunio C Hamano2012-07-091-8/+62
| * | | apply: move verify_index_match() higherJunio C Hamano2012-07-091-10/+10
| * | | apply: plug the three-way merge logic inJunio C Hamano2012-07-091-3/+50
| * | | apply: fall back on three-way mergeJunio C Hamano2012-07-091-1/+45
| * | | apply: accept -3/--3way command line optionJunio C Hamano2012-07-091-2/+23
| * | | apply: move "already exists" logic to check_to_create()Junio C Hamano2012-07-091-11/+29
| * | | apply: move check_to_create_blob() closer to its sole callerJunio C Hamano2012-07-091-23/+23
| * | | apply: further split load_preimage()Junio C Hamano2012-07-091-19/+40
View Lorry Controller Status