summaryrefslogtreecommitdiff
path: root/builtin-apply.c
AgeCommit message (Expand)AuthorFilesLines
2010-03-06apply: Allow blank context lines to match beyond EOFLibravatar Björn Gustavsson1-30/+138
2010-03-06apply: Remove the quick rejection testLibravatar Björn Gustavsson1-5/+7
2010-03-06apply: Don't unnecessarily update line lengths in the preimageLibravatar Björn Gustavsson1-11/+6
2010-01-20Merge branch 'ag/patch-header-verify'Libravatar Junio C Hamano1-1/+1
2010-01-20Merge branch 'ag/maint-apply-too-large-p'Libravatar Junio C Hamano1-2/+9
2010-01-18builtin-apply.c: fix the --- and +++ header filename consistency checkLibravatar Andreas Gruenbacher1-1/+1
2010-01-18builtin-apply.c: Skip filenames without enough componentsLibravatar Andreas Gruenbacher1-2/+9
2010-01-13Merge branch 'nd/sparse'Libravatar Junio C Hamano1-1/+1
2009-12-14ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2009-11-26builtin-apply.c: pay attention to -p<n> when determining the nameLibravatar Junio C Hamano1-2/+3
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintLibravatar Junio C Hamano1-19/+42
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Libravatar Junio C Hamano1-19/+42
2009-09-04apply --whitespace: warn blank but not necessarily empty lines at EOFLibravatar Junio C Hamano1-2/+4
2009-09-04apply --whitespace=warn/error: diagnose blank at EOFLibravatar Junio C Hamano1-9/+18
2009-09-04apply.c: split check_whitespace() into twoLibravatar Junio C Hamano1-9/+15
2009-09-04apply --whitespace=fix: detect new blank lines at eof correctlyLibravatar Junio C Hamano1-0/+6
2009-09-04apply --whitespace=fix: fix handling of blank lines at the eofLibravatar Junio C Hamano1-1/+1
2009-09-01builtin-apply.c: get rid of an unnecessary use of temporary arrayLibravatar Junio C Hamano1-8/+6
2009-08-21Merge branch 'gb/apply-ignore-whitespace'Libravatar Junio C Hamano1-7/+166
2009-08-05git apply: option to ignore whitespace differencesLibravatar Giuseppe Bilotta1-7/+166
2009-07-11apply: notice creation/removal patches produced by GNU diffLibravatar Junio C Hamano1-1/+81
2009-07-06Merge branch 'tr/die_errno'Libravatar Junio C Hamano1-6/+6
2009-06-27Use die_errno() instead of die() when checking syscallsLibravatar Thomas Rast1-3/+3
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Libravatar Thomas Rast1-3/+3
2009-06-20Fix various sparse warnings in the git source codeLibravatar Linus Torvalds1-1/+1
2009-06-06parse-options: simplify usage argh handlingLibravatar Stephen Boyd1-2/+4
2009-05-31Merge branch 'sb/opt-filename'Libravatar Junio C Hamano1-5/+2
2009-05-31Merge branch 'mm/apply-double-slash'Libravatar Junio C Hamano1-6/+20
2009-05-29Merge branch 'sb/maint-1.6.2-opt-filename-fix'Libravatar Junio C Hamano1-0/+4
2009-05-25parse-opts: add OPT_FILENAME and transition builtinsLibravatar Stephen Boyd1-4/+1
2009-05-25parse-opts: prepare for OPT_FILENAMELibravatar Stephen Boyd1-1/+1
2009-05-25Merge branch 'master' into sb/opt-filenameLibravatar Junio C Hamano1-15/+14
2009-05-24apply: handle filenames with double slashes betterLibravatar Michal Marek1-6/+20
2009-05-23apply, fmt-merge-msg: use relative filenamesLibravatar Stephen Boyd1-0/+4
2009-04-29replace direct calls to unlink(2) with unlink_or_warnLibravatar Alex Riesen1-2/+2
2009-04-20builtin-apply: keep information about files to be deletedLibravatar Michał Kiedrowicz1-7/+46
2009-04-16git-apply: fix option descriptionLibravatar Ulrich Windl1-1/+1
2009-04-15builtin-apply: keep information about files to be deletedLibravatar Michał Kiedrowicz1-7/+46
2009-03-23builtin-apply: use warning() instead of fprintf(stderr, "warning: ")Libravatar Miklos Vajna1-8/+7
2009-03-18apply: hide unused options from short helpLibravatar Michele Ballabio1-4/+4
2009-03-18apply: consistent spelling of "don't"Libravatar Michele Ballabio1-1/+1
2009-02-09lstat_cache(): swap func(length, string) into func(string, length)Libravatar Kjetil Barvik1-1/+1
2009-02-04Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2009-02-03Merge branch 'maint-1.6.0' into maintLibravatar Junio C Hamano1-1/+1
2009-02-03apply: fix access to an uninitialized mode variable, found by valgrindLibravatar Johannes Schindelin1-1/+1
2009-01-31Merge branch 'jc/maint-apply-fix'Libravatar Junio C Hamano1-1/+1
2009-01-28builtin-apply.c: do not set bogus mode in check_preimage() for deleted pathLibravatar Junio C Hamano1-1/+1
2009-01-21Merge branch 'lt/maint-wrap-zlib'Libravatar Junio C Hamano1-2/+3
2009-01-17Merge branch 'mv/apply-parse-opt'Libravatar Junio C Hamano1-126/+140
2009-01-13Merge branch 'ap/maint-apply-modefix' into maintLibravatar Junio C Hamano1-1/+3