summaryrefslogtreecommitdiff
path: root/convert.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* strbuf change: be sure ->buf is never ever NULL.Pierre Habouzit2007-09-291-2/+2
* Use xmemdupz() in many places.Pierre Habouzit2007-09-181-6/+1
* Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit2007-09-161-1/+0
* Rewrite convert_to_{git,working_tree} to use strbuf's.Pierre Habouzit2007-09-161-243/+171
* Remove unused function convert_sha1_file()René Scharfe2007-09-031-15/+0
* Fix mishandling of $Id$ expanded in the repository copy in convert.cAndy Parkins2007-05-261-2/+37
* Fix crlf attribute handling to match documentationAndy Parkins2007-05-181-2/+2
* git-archive: convert archive entries like checkouts doRené Scharfe2007-05-181-0/+15
* Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent ...Andy Parkins2007-05-141-22/+22
* Add 'filter' attribute and external filter driver definition.Junio C Hamano2007-04-241-3/+234
* Add 'ident' conversion.Junio C Hamano2007-04-241-10/+184
* Fix a typo in crlf conversion codeAlex Riesen2007-04-221-5/+5
* convert.c: restructure the attribute checking part.Junio C Hamano2007-04-211-20/+28
* Simplify calling of CR/LF conversion routinesAlex Riesen2007-04-201-36/+35
* Update 'crlf' attribute semantics.Junio C Hamano2007-04-191-49/+26
* Fix funny types used in attribute value representationJunio C Hamano2007-04-181-1/+1
* Allow more than true/false to attributes.Junio C Hamano2007-04-171-3/+13
* Fix 'crlf' attribute semantics.Junio C Hamano2007-04-151-44/+78
* Define 'crlf' attribute.Junio C Hamano2007-04-141-7/+42
* Make AutoCRLF ternary variable.Linus Torvalds2007-02-141-1/+1