summaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Shawn O. Pearce2008-10-121-0/+7
|\
| * git apply --directory broken for new filesJeff King2008-10-121-0/+7
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-18/+8
* | Merge branch 'maint'Shawn O. Pearce2008-10-091-1/+1
|\ \ | |/
| * builtin-apply: fix typo leading to stack corruptionImre Deak2008-10-091-1/+1
| * do not segfault if make_cache_entry failedDmitry Potapov2008-10-061-0/+2
* | do not segfault if make_cache_entry failedDmitry Potapov2008-10-061-0/+2
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-9/+2
|\ \ | |/
| * Use remove_path from dir.c instead of own implementationAlex Riesen2008-09-291-9/+2
* | git-apply:--include=pathspecJunio C Hamano2008-09-061-15/+33
|/
* Merge branch 'ho/dashless' into maintJunio C Hamano2008-09-031-4/+4
|\
| * 'git foo' program identifies itself without dash in die() messagesJunio C Hamano2008-08-311-3/+3
| * Start conforming code to "git subcmd" styleHeikki Orsila2008-08-301-1/+1
* | git-apply: Loosen "match_beginning" logicJunio C Hamano2008-08-301-1/+4
|/
* Rename path_list to string_listJohannes Schindelin2008-07-211-8/+8
* Make usage strings dash-lessStephan Beyer2008-07-131-1/+1
* apply: fix copy/rename breakageJunio C Hamano2008-07-091-3/+7
* Merge branch 'js/apply-root'Junio C Hamano2008-07-091-0/+24
|\
| * git-apply --directory: make --root more similar to GNU diffJunio C Hamano2008-07-061-2/+2
| * apply --root: thinkofix.Junio C Hamano2008-07-021-2/+2
| * Teach "git apply" to prepend a prefix with "--root=<root>"Johannes Schindelin2008-07-011-0/+24
* | Fix apply --recount handling of no-EOL lineThomas Rast2008-07-051-1/+1
* | Merge branch 'js/apply-recount'Junio C Hamano2008-07-011-7/+68
|\ \
| * | Allow git-apply to recount the lines in a hunk (AKA recountdiff)Johannes Schindelin2008-06-281-7/+68
| |/
* | Merge branch 'jc/checkdiff'Junio C Hamano2008-07-011-3/+2
|\ \
| * | check_and_emit_line(): rename and refactorJunio C Hamano2008-06-261-3/+2
| |/
* | git-apply: handle a patch that touches the same path more than once betterDon Zickus2008-06-271-10/+72
|/
* Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-251-3/+3
|\
| * Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-3/+3
* | builtin-apply: do not declare patch is creation when we do not know itJunio C Hamano2008-05-171-15/+0
* | builtin-apply: accept patch to an empty fileJunio C Hamano2008-05-171-56/+77
* | builtin-apply: typofixJunio C Hamano2008-05-171-1/+1
|/
* Optimize symlink/directory detectionLinus Torvalds2008-05-101-1/+1
* Merge branch 'maint'Junio C Hamano2008-04-161-1/+1
|\
| * Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-161-1/+1
| |\
| | * builtin-apply: Show a more descriptive error on failure when opening a patchAlberto Bertogli2008-04-151-1/+1
* | | builtin-apply.c: use git_config_string() to get apply_default_whitespaceStephan Beyer2008-04-141-6/+2
|/ /
* | Merge branch 'jc/maint-apply-match-beginning'Junio C Hamano2008-04-061-13/+16
|\ \ | |/
| * Fix "git apply" to correctly enforce "match at the beginning"Junio C Hamano2008-04-061-13/+16
* | Always set *nongit_ok in setup_git_directory_gently()SZEDER Gábor2008-03-261-1/+1
* | Merge branch 'jc/apply-whitespace'Junio C Hamano2008-02-241-243/+476
|\ \
| * | ws_fix_copy(): move the whitespace fixing function to ws.cJunio C Hamano2008-02-231-108/+3
| * | apply: do not barf on patch with too large an offsetJunio C Hamano2008-02-111-0/+3
| * | core.whitespace: cr-at-eolJunio C Hamano2008-02-051-4/+14
| * | git-apply --whitespace=fix: fix whitespace fuzz introduced by previous runJunio C Hamano2008-02-051-5/+128
| * | builtin-apply.c: pass ws_rule down to match_fragment()Junio C Hamano2008-02-051-3/+5
| * | builtin-apply.c: move copy_wsfix() function a bit higher.Junio C Hamano2008-02-051-94/+94
| * | builtin-apply.c: do not feed copy_wsfix() leading '+'Junio C Hamano2008-02-051-20/+18
| * | builtin-apply.c: simplify calling site to apply_line()Junio C Hamano2008-02-051-18/+20
| * | builtin-apply.c: clean-up apply_one_fragment()Junio C Hamano2008-02-051-28/+27
View Lorry Controller Status