summaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAgeFilesLines
* parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-1/+1
* Merge branch 'master' into sb/opt-filenameJunio C Hamano2009-05-251-15/+14
|\
| * replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-291-2/+2
| * builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-151-7/+46
| * builtin-apply: use warning() instead of fprintf(stderr, "warning: ")Miklos Vajna2009-03-231-8/+7
| * apply: hide unused options from short helpMichele Ballabio2009-03-181-4/+4
| * apply: consistent spelling of "don't"Michele Ballabio2009-03-181-1/+1
| * lstat_cache(): swap func(length, string) into func(string, length)Kjetil Barvik2009-02-091-1/+1
* | apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-231-0/+4
* | builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-201-7/+46
* | git-apply: fix option descriptionUlrich Windl2009-04-161-1/+1
|/
* Merge branch 'maint'Junio C Hamano2009-02-041-1/+1
|\
| * Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-031-1/+1
| |\
| | * apply: fix access to an uninitialized mode variable, found by valgrindJohannes Schindelin2009-02-031-1/+1
* | | Merge branch 'jc/maint-apply-fix'Junio C Hamano2009-01-311-1/+1
|\ \ \
| * | | builtin-apply.c: do not set bogus mode in check_preimage() for deleted pathJunio C Hamano2009-01-281-1/+1
| |/ /
| * | Merge branch 'ap/maint-apply-modefix' into maintJunio C Hamano2009-01-131-1/+3
| |\ \
* | \ \ Merge branch 'lt/maint-wrap-zlib'Junio C Hamano2009-01-211-2/+3
|\ \ \ \
| * | | | Wrap inflate and other zlib routines for better error reportingLinus Torvalds2009-01-111-2/+3
| | |_|/ | |/| |
* | | | Merge branch 'mv/apply-parse-opt'Junio C Hamano2009-01-171-126/+140
|\ \ \ \
| * | | | Resurrect "git apply --flags -" to read from the standard inputJunio C Hamano2009-01-091-14/+5
| * | | | parse-opt: migrate builtin-apply.Miklos Vajna2008-12-301-129/+152
| | |/ / | |/| |
* | | | Merge branch 'ap/maint-apply-modefix'Junio C Hamano2009-01-031-1/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | builtin-apply: prevent non-explicit permission changesJunio C Hamano2009-01-021-1/+3
* | | Add generic 'strbuf_readlink()' helper functionLinus Torvalds2008-12-171-4/+2
* | | Merge branch 'ar/maint-mksnpath' into HEADJunio C Hamano2008-10-261-2/+2
|\ \ \ | | |/ | |/|
| * | Fix potentially dangerous uses of mkpath and git_pathAlex Riesen2008-10-261-2/+2
* | | 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
|\ \
View Lorry Controller Status