summaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ag/maint-apply-too-large-p'Junio C Hamano2010-01-201-2/+9
|\
| * builtin-apply.c: Skip filenames without enough componentsAndreas Gruenbacher2010-01-181-2/+9
* | Merge branch 'nd/sparse'Junio C Hamano2010-01-131-1/+1
|\ \ | |/ |/|
| * ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy2009-12-141-1/+1
* | builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2009-11-261-2/+3
* | Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-151-19/+42
|\ \
| * \ Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano2009-09-151-19/+42
| |\ \ | | |/ | |/|
| | * apply --whitespace: warn blank but not necessarily empty lines at EOFJunio C Hamano2009-09-041-2/+4
| | * apply --whitespace=warn/error: diagnose blank at EOFJunio C Hamano2009-09-041-9/+18
| | * apply.c: split check_whitespace() into twoJunio C Hamano2009-09-041-9/+15
| | * apply --whitespace=fix: detect new blank lines at eof correctlyJunio C Hamano2009-09-041-0/+6
| | * apply --whitespace=fix: fix handling of blank lines at the eofJunio C Hamano2009-09-041-1/+1
* | | builtin-apply.c: get rid of an unnecessary use of temporary arrayJunio C Hamano2009-09-011-8/+6
* | | Merge branch 'gb/apply-ignore-whitespace'Junio C Hamano2009-08-211-7/+166
|\ \ \ | |/ / |/| |
| * | git apply: option to ignore whitespace differencesGiuseppe Bilotta2009-08-051-7/+166
* | | apply: notice creation/removal patches produced by GNU diffJunio C Hamano2009-07-111-1/+81
|/ /
* | Merge branch 'tr/die_errno'Junio C Hamano2009-07-061-6/+6
|\ \
| * | Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-271-3/+3
| * | Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-271-3/+3
* | | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-201-1/+1
* | | parse-options: simplify usage argh handlingStephen Boyd2009-06-061-2/+4
|/ /
* | Merge branch 'sb/opt-filename'Junio C Hamano2009-05-311-5/+2
|\ \
| * | parse-opts: add OPT_FILENAME and transition builtinsStephen Boyd2009-05-251-4/+1
| * | parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-1/+1
| * | Merge branch 'master' into sb/opt-filenameJunio C Hamano2009-05-251-15/+14
| |\ \
* | \ \ Merge branch 'mm/apply-double-slash'Junio C Hamano2009-05-311-6/+20
|\ \ \ \
| * | | | apply: handle filenames with double slashes betterMichal Marek2009-05-241-6/+20
| | |/ / | |/| |
* | | | Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-291-0/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 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
* | | 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
|/ /
* | 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
View Lorry Controller Status