aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAge
* Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maintJunio C Hamano2009-06-02
|\
| * apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-23
| * builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-20
| * git-apply: fix option descriptionUlrich Windl2009-04-16
* | replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-29
* | builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-15
* | builtin-apply: use warning() instead of fprintf(stderr, "warning: ")Miklos Vajna2009-03-23
* | apply: hide unused options from short helpMichele Ballabio2009-03-18
* | apply: consistent spelling of "don't"Michele Ballabio2009-03-18
* | lstat_cache(): swap func(length, string) into func(string, length)Kjetil Barvik2009-02-09
|/
* Merge branch 'maint'Junio C Hamano2009-02-04
|\
| * Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-03
| |\
| | * apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin2009-02-03
* | | Merge branch 'jc/maint-apply-fix'Junio C Hamano2009-01-31
|\ \ \
| * | | builtin-apply.c: do not set bogus mode in check_preimage() for deleted pathJunio C Hamano2009-01-28
| |/ /
| * | Merge branch 'ap/maint-apply-modefix' into maintJunio C Hamano2009-01-13
| |\ \
* | \ \ Merge branch 'lt/maint-wrap-zlib'Junio C Hamano2009-01-21
|\ \ \ \
| * | | | Wrap inflate and other zlib routines for better error reportingLinus Torvalds2009-01-11
| | |_|/ | |/| |
* | | | Merge branch 'mv/apply-parse-opt'Junio C Hamano2009-01-17
|\ \ \ \
| * | | | Resurrect "git apply --flags -" to read from the standard inputJunio C Hamano2009-01-09
| * | | | parse-opt: migrate builtin-apply.Miklos Vajna2008-12-30
| | |/ / | |/| |
* | | | Merge branch 'ap/maint-apply-modefix'Junio C Hamano2009-01-03
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | builtin-apply: prevent non-explicit permission changesJunio C Hamano2009-01-02
* | | Add generic 'strbuf_readlink()' helper functionLinus Torvalds2008-12-17
* | | Merge branch 'ar/maint-mksnpath' into HEADJunio C Hamano2008-10-26
|\ \ \ | | |/ | |/|
| * | Fix potentially dangerous uses of mkpath and git_pathAlex Riesen2008-10-26
* | | Merge branch 'maint'Shawn O. Pearce2008-10-12
|\ \ \ | |/ /
| * | git apply --directory broken for new filesJeff King2008-10-12
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-12
* | | Merge branch 'maint'Shawn O. Pearce2008-10-09
|\ \ \ | |/ /
| * | builtin-apply: fix typo leading to stack corruptionImre Deak2008-10-09
| * | do not segfault if make_cache_entry failedDmitry Potapov2008-10-06
* | | do not segfault if make_cache_entry failedDmitry Potapov2008-10-06
* | | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29
|\ \ \ | |/ /
| * | Use remove_path from dir.c instead of own implementationAlex Riesen2008-09-29
* | | git-apply:--include=pathspecJunio C Hamano2008-09-06
|/ /
* | Merge branch 'ho/dashless' into maintJunio C Hamano2008-09-03
|\ \
| * | 'git foo' program identifies itself without dash in die() messagesJunio C Hamano2008-08-31
| * | Start conforming code to "git subcmd" styleHeikki Orsila2008-08-30
* | | git-apply: Loosen "match_beginning" logicJunio C Hamano2008-08-30
|/ /
* | Rename path_list to string_listJohannes Schindelin2008-07-21
* | Make usage strings dash-lessStephan Beyer2008-07-13
* | apply: fix copy/rename breakageJunio C Hamano2008-07-09
* | Merge branch 'js/apply-root'Junio C Hamano2008-07-09
|\ \
| * | git-apply --directory: make --root more similar to GNU diffJunio C Hamano2008-07-06
| * | apply --root: thinkofix.Junio C Hamano2008-07-02
| * | Teach "git apply" to prepend a prefix with "--root=<root>"Johannes Schindelin2008-07-01
| |/
* | Fix apply --recount handling of no-EOL lineThomas Rast2008-07-05
* | Merge branch 'js/apply-recount'Junio C Hamano2008-07-01
|\ \
| * | Allow git-apply to recount the lines in a hunk (AKA recountdiff)Johannes Schindelin2008-06-28
| |/