summaryrefslogtreecommitdiff
path: root/convert.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cn/maint-lf-to-crlf-filter'Junio C Hamano2011-12-131-13/+37
|\
| * convert: track state in LF-to-CRLF filterCarlos Martín Nieto2011-11-281-13/+37
* | convert.c: Fix return type of git_path_check_eol()rr/misc-fixesRamsay Jones2011-11-211-1/+1
* | convert: don't mix enum with intRamkumar Ramachandra2011-11-151-3/+3
|/
* Merge branch 'tr/maint-ident-to-git-memmove'Junio C Hamano2011-09-021-2/+2
|\
| * Use memmove in ident_to_gitThomas Rast2011-08-291-2/+2
* | Rename git_checkattr() to git_check_attr()Michael Haggerty2011-08-041-1/+1
* | streaming: filter cascadingJunio C Hamano2011-05-261-14/+112
* | streaming filter: ident filterJunio C Hamano2011-05-261-8/+169
* | Add LF-to-CRLF streaming conversionJunio C Hamano2011-05-261-0/+41
* | stream filter: add "no more input" to the filtersJunio C Hamano2011-05-261-1/+5
* | Add streaming filter APIJunio C Hamano2011-05-261-7/+77
* | convert: CRLF_INPUT is a no-op in the output codepathJunio C Hamano2011-05-201-1/+1
* | streaming_write_entry(): use streaming API in write_entry()Junio C Hamano2011-05-201-0/+23
|/
* convert: make it harder to screw up adding a conversion attributeJunio C Hamano2011-05-091-41/+38
* convert: make it safer to add conversion attributesJunio C Hamano2011-05-091-26/+22
* convert: give saner names to crlf/eol variables, types and functionsJunio C Hamano2011-05-091-30/+31
* convert: rename the "eol" global variable to "core_eol"Junio C Hamano2011-05-091-2/+2
* enums: omit trailing comma for portabilityJonathan Nieder2011-03-161-1/+1
* convert filter: supply path to external driverPete Wyckoff2010-12-221-1/+22
* Don't expand CRLFs when normalizing text during mergeEyvind Bernhardsen2010-07-021-7/+20
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-2/+14
* Merge branch 'eb/core-eol'Junio C Hamano2010-06-211-40/+110
|\
| * Add "core.eol" config variableEyvind Bernhardsen2010-06-061-24/+36
| * Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-191-8/+15
| * Add per-repository eol normalizationEyvind Bernhardsen2010-05-191-33/+84
* | Merge branch 'fg/autocrlf'Junio C Hamano2010-06-211-0/+49
|\ \ | |/
| * autocrlf: Make it work also for un-normalized repositoriesFinn Arne Gangstad2010-05-111-0/+49
* | Merge branch 'gv/portable'Junio C Hamano2010-06-211-1/+3
|\ \
| * | Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-311-1/+3
* | | convert: Keep foreign $Id$ on checkout.Henrik Grubbström2010-04-101-2/+14
* | | convert: Safer handling of $Id$ contraction.Henrik Grubbström2010-04-101-0/+12
|/ /
* | Merge branch 'sp/maint-push-sideband' into sp/push-sidebandJunio C Hamano2010-02-051-2/+3
|\ \ | |/ |/|
| * run-command: support custom fd-set in asyncErik Faye-Lund2010-02-051-2/+3
* | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-201-3/+3
|\ \
| * | git_attr(): fix function signatureJunio C Hamano2010-01-161-3/+3
| |/
* | run-command: convert simple callsites to use_shellJeff King2010-01-051-1/+2
|/
* run_command: return exit code as positive valueJohannes Sixt2009-07-051-1/+1
* Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-2/+1
* Fixed text file auto-detection: treat EOF character 032 at the end of file as...Dmitry Kakurin2008-07-111-0/+4
* convert.c: Use 'git_config_string' to get 'smudge' and 'clean'Brian Hetro2008-07-051-16/+9
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-2/+2
* Merge branch 'sp/safecrlf'Junio C Hamano2008-02-161-6/+41
|\
| * safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska2008-02-061-6/+41
* | convert.c: guard config parser from value=NULLJunio C Hamano2008-02-111-2/+2
|/
* treat any file with NUL as binaryDmitry Potapov2008-01-161-2/+7
* Use the asyncronous function infrastructure to run the content filter.Johannes Sixt2007-10-211-33/+28
* Avoid a dup2(2) in apply_filter() - start_command() can do it for us.Johannes Sixt2007-10-211-4/+3
* Use start_command() to run content filters instead of explicit fork/exec.Johannes Sixt2007-10-211-23/+7
* Fix in-place editing functions in convert.cPierre Habouzit2007-10-151-7/+10