| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' | Junio C Hamano | 2011-12-22 | 1 | -10/+50 |
|\ |
|
| * | lf_to_crlf_filter(): resurrect CRLF->CRLF hackjc/maint-lf-to-crlf-keep-crlf | Junio C Hamano | 2011-12-18 | 1 | -10/+50 |
* | | Merge branch 'cn/maint-lf-to-crlf-filter' into maint | Junio C Hamano | 2011-12-21 | 1 | -14/+40 |
|\ \
| |/ |
|
| * | lf_to_crlf_filter(): tell the caller we added "\n" when drainingcn/maint-lf-to-crlf-filter | Junio C Hamano | 2011-12-16 | 1 | -5/+7 |
| * | convert: track state in LF-to-CRLF filter | Carlos Martín Nieto | 2011-11-28 | 1 | -13/+37 |
* | | convert.c: Fix return type of git_path_check_eol()rr/misc-fixes | Ramsay Jones | 2011-11-21 | 1 | -1/+1 |
* | | convert: don't mix enum with int | Ramkumar Ramachandra | 2011-11-15 | 1 | -3/+3 |
|/ |
|
* | Merge branch 'tr/maint-ident-to-git-memmove' | Junio C Hamano | 2011-09-02 | 1 | -2/+2 |
|\ |
|
| * | Use memmove in ident_to_git | Thomas Rast | 2011-08-29 | 1 | -2/+2 |
* | | Rename git_checkattr() to git_check_attr() | Michael Haggerty | 2011-08-04 | 1 | -1/+1 |
* | | streaming: filter cascading | Junio C Hamano | 2011-05-26 | 1 | -14/+112 |
* | | streaming filter: ident filter | Junio C Hamano | 2011-05-26 | 1 | -8/+169 |
* | | Add LF-to-CRLF streaming conversion | Junio C Hamano | 2011-05-26 | 1 | -0/+41 |
* | | stream filter: add "no more input" to the filters | Junio C Hamano | 2011-05-26 | 1 | -1/+5 |
* | | Add streaming filter API | Junio C Hamano | 2011-05-26 | 1 | -7/+77 |
* | | convert: CRLF_INPUT is a no-op in the output codepath | Junio C Hamano | 2011-05-20 | 1 | -1/+1 |
* | | streaming_write_entry(): use streaming API in write_entry() | Junio C Hamano | 2011-05-20 | 1 | -0/+23 |
|/ |
|
* | convert: make it harder to screw up adding a conversion attribute | Junio C Hamano | 2011-05-09 | 1 | -41/+38 |
* | convert: make it safer to add conversion attributes | Junio C Hamano | 2011-05-09 | 1 | -26/+22 |
* | convert: give saner names to crlf/eol variables, types and functions | Junio C Hamano | 2011-05-09 | 1 | -30/+31 |
* | convert: rename the "eol" global variable to "core_eol" | Junio C Hamano | 2011-05-09 | 1 | -2/+2 |
* | enums: omit trailing comma for portability | Jonathan Nieder | 2011-03-16 | 1 | -1/+1 |
* | convert filter: supply path to external driver | Pete Wyckoff | 2010-12-22 | 1 | -1/+22 |
* | Don't expand CRLFs when normalizing text during merge | Eyvind Bernhardsen | 2010-07-02 | 1 | -7/+20 |
* | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 1 | -2/+14 |
* | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 | 1 | -40/+110 |
|\ |
|
| * | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 | 1 | -24/+36 |
| * | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-19 | 1 | -8/+15 |
| * | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 1 | -33/+84 |
* | | Merge branch 'fg/autocrlf' | Junio C Hamano | 2010-06-21 | 1 | -0/+49 |
|\ \
| |/ |
|
| * | autocrlf: Make it work also for un-normalized repositories | Finn Arne Gangstad | 2010-05-11 | 1 | -0/+49 |
* | | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -1/+3 |
|\ \ |
|
| * | | Rewrite dynamic structure initializations to runtime assignment | Gary V. Vaughan | 2010-05-31 | 1 | -1/+3 |
* | | | convert: Keep foreign $Id$ on checkout. | Henrik Grubbström | 2010-04-10 | 1 | -2/+14 |
* | | | convert: Safer handling of $Id$ contraction. | Henrik Grubbström | 2010-04-10 | 1 | -0/+12 |
|/ / |
|
* | | Merge branch 'sp/maint-push-sideband' into sp/push-sideband | Junio C Hamano | 2010-02-05 | 1 | -2/+3 |
|\ \
| |/
|/| |
|
| * | run-command: support custom fd-set in async | Erik Faye-Lund | 2010-02-05 | 1 | -2/+3 |
* | | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 | 1 | -3/+3 |
|\ \ |
|
| * | | git_attr(): fix function signature | Junio C Hamano | 2010-01-16 | 1 | -3/+3 |
| |/ |
|
* | | run-command: convert simple callsites to use_shell | Jeff King | 2010-01-05 | 1 | -1/+2 |
|/ |
|
* | run_command: return exit code as positive value | Johannes Sixt | 2009-07-05 | 1 | -1/+1 |
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 | 1 | -2/+1 |
* | Fixed text file auto-detection: treat EOF character 032 at the end of file as... | Dmitry Kakurin | 2008-07-11 | 1 | -0/+4 |
* | convert.c: Use 'git_config_string' to get 'smudge' and 'clean' | Brian Hetro | 2008-07-05 | 1 | -16/+9 |
* | Provide git_config with a callback-data parameter | Johannes Schindelin | 2008-05-14 | 1 | -2/+2 |
* | Merge branch 'sp/safecrlf' | Junio C Hamano | 2008-02-16 | 1 | -6/+41 |
|\ |
|
| * | safecrlf: Add mechanism to warn about irreversible crlf conversions | Steffen Prohaska | 2008-02-06 | 1 | -6/+41 |
* | | convert.c: guard config parser from value=NULL | Junio C Hamano | 2008-02-11 | 1 | -2/+2 |
|/ |
|
* | treat any file with NUL as binary | Dmitry Potapov | 2008-01-16 | 1 | -2/+7 |
* | Use the asyncronous function infrastructure to run the content filter. | Johannes Sixt | 2007-10-21 | 1 | -33/+28 |