aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2008-04-16
|\
| * Merge branch 'maint-1.5.4' into maintJunio C Hamano2008-04-16
| |\
| | * builtin-apply: Show a more descriptive error on failure when opening a patchAlberto Bertogli2008-04-15
* | | builtin-apply.c: use git_config_string() to get apply_default_whitespaceStephan Beyer2008-04-14
|/ /
* | Merge branch 'jc/maint-apply-match-beginning'Junio C Hamano2008-04-06
|\ \ | |/
| * Fix "git apply" to correctly enforce "match at the beginning"Junio C Hamano2008-04-06
* | Always set *nongit_ok in setup_git_directory_gently()SZEDER Gábor2008-03-26
* | Merge branch 'jc/apply-whitespace'Junio C Hamano2008-02-24
|\ \
| * | ws_fix_copy(): move the whitespace fixing function to ws.cJunio C Hamano2008-02-23
| * | apply: do not barf on patch with too large an offsetJunio C Hamano2008-02-11
| * | core.whitespace: cr-at-eolJunio C Hamano2008-02-05
| * | git-apply --whitespace=fix: fix whitespace fuzz introduced by previous runJunio C Hamano2008-02-05
| * | builtin-apply.c: pass ws_rule down to match_fragment()Junio C Hamano2008-02-05
| * | builtin-apply.c: move copy_wsfix() function a bit higher.Junio C Hamano2008-02-05
| * | builtin-apply.c: do not feed copy_wsfix() leading '+'Junio C Hamano2008-02-05
| * | builtin-apply.c: simplify calling site to apply_line()Junio C Hamano2008-02-05
| * | builtin-apply.c: clean-up apply_one_fragment()Junio C Hamano2008-02-05
| * | builtin-apply.c: mark common context lines in lineinfo structure.Junio C Hamano2008-02-05
| * | builtin-apply.c: optimize match_beginning/end processing a bit.Junio C Hamano2008-02-05
| * | builtin-apply.c: make it more line orientedJunio C Hamano2008-02-05
| * | builtin-apply.c: push match-beginning/end logic downJunio C Hamano2008-02-05
| * | builtin-apply.c: restructure "offset" matchingJunio C Hamano2008-02-05
| * | builtin-apply.c: refactor small part that matches contextJunio C Hamano2008-02-05
* | | Merge branch 'sp/safecrlf'Junio C Hamano2008-02-16
|\ \ \
| * | | safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska2008-02-06
| |/ /
* | | Merge branch 'lt/in-core-index'Junio C Hamano2008-02-11
|\ \ \ | |_|/ |/| |
| * | Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-21
| |/
* | builtin-apply.c: guard config parser from value=NULLJunio C Hamano2008-02-11
|/
* Improve use of lockfile APIBrandon Casey2008-01-16
* "git-apply --check" should not report "fixed"Junio C Hamano2008-01-08
* builtin-apply: stronger indent-with-on-tab fixingJ. Bruce Fields2007-12-16
* builtin-apply: minor cleanup of whitespace detectionJ. Bruce Fields2007-12-16
* Make "diff --check" output match "git apply"Wincent Colaiuta2007-12-13
* Unify whitespace checkingWincent Colaiuta2007-12-13
* Merge branch 'jc/spht'Junio C Hamano2007-12-09
|\
| * Use gitattributes to define per-path whitespace ruleJunio C Hamano2007-12-06
| * core.whitespace: documentation updates.Junio C Hamano2007-11-24
| * builtin-apply: teach whitespace_rulesJunio C Hamano2007-11-24
| * builtin-apply: rename "whitespace" variables and fix stylesJunio C Hamano2007-11-23
* | Remove unreachable statementsGuido Ostkamp2007-11-15
* | Merge branch 'jc/maint-add-sync-stat'Junio C Hamano2007-11-14
|\ \ | |/ |/|
| * ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano2007-11-10
| * apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin2007-09-26
* | Correct some sizeof(size_t) != sizeof(unsigned long) typing errorsRené Scharfe2007-10-22
* | builtin-apply: fix conversion error in strbuf seriesJunio C Hamano2007-10-03
* | Merge branch 'ph/strbuf'Junio C Hamano2007-10-03
|\ \
| * | Make read_patch_file work on a strbuf.Pierre Habouzit2007-09-29
| * | strbuf_read_file enhancement, and use it.Pierre Habouzit2007-09-29
| * | strbuf change: be sure ->buf is never ever NULL.Pierre Habouzit2007-09-29
| * | Full rework of quote_c_style and write_name_quoted.Pierre Habouzit2007-09-20