Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint-2.1' into maint | Junio C Hamano | 2015-01-07 | 1 | -12/+20 |
|\ | |||||
| * | Merge branch 'maint-2.0' into maint-2.1maint-2.1 | Junio C Hamano | 2015-01-07 | 1 | -12/+20 |
| |\ | |||||
| | * | Merge branch 'maint-1.9' into maint-2.0maint-2.0 | Junio C Hamano | 2015-01-07 | 1 | -12/+20 |
| | |\ | |||||
| | | * | Merge branch 'maint-1.8.5' into maint-1.9maint-1.9 | Junio C Hamano | 2015-01-07 | 1 | -12/+20 |
| | | |\ | |||||
| | | | * | is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5 | Jeff King | 2014-12-29 | 1 | -12/+20 |
* | | | | | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 | 1 | -0/+64 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 | 1 | -0/+64 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 1 | -0/+64 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 1 | -0/+64 |
| | | |\ \ | | | | |/ | |||||
| | | | * | utf8: add is_hfs_dotgit() helper | Jeff King | 2014-12-17 | 1 | -0/+64 |
* | | | | | Merge branch 'rs/export-strbuf-addchars' | Junio C Hamano | 2014-09-19 | 1 | -7/+0 |
|\ \ \ \ \ | |||||
| * | | | | | strbuf: export strbuf_addchars() | René Scharfe | 2014-09-08 | 1 | -7/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'nd/strbuf-utf8-replace' | Junio C Hamano | 2014-09-09 | 1 | -0/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | utf8.c: fix strbuf_utf8_replace() consuming data beyond input stringnd/strbuf-utf8-replace | Nguyễn Thái Ngọc Duy | 2014-08-11 | 1 | -0/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'tb/unicode-6.3-zero-width' | Junio C Hamano | 2014-06-06 | 1 | -69/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | utf8: make it easier to auto-update git_wcwidth()tb/unicode-6.3-zero-width | Torsten Bögershausen | 2014-05-12 | 1 | -59/+2 |
| * | | | utf8.c: use a table for double_width | Torsten Bögershausen | 2014-05-12 | 1 | -23/+18 |
| | |/ | |/| | |||||
* | | | Merge branch 'tb/unicode-6.3-zero-width' | Junio C Hamano | 2014-04-16 | 1 | -5/+4 |
|\ \ \ | |/ / | |||||
| * | | utf8.c: partially update to version 6.3 | Torsten Bögershausen | 2014-04-09 | 1 | -5/+4 |
| |/ | |||||
* | | utf8: use correct type for values in interval table | John Keeping | 2014-02-18 | 1 | -2/+2 |
* | | utf8: fix iconv error detection | John Keeping | 2014-02-18 | 1 | -1/+1 |
|/ | |||||
* | pretty: Fix bug in truncation support for %>, %< and %>< | Ramsay Jones | 2013-04-28 | 1 | -2/+2 |
* | pretty: support %>> that steal trailing spaces | Nguyễn Thái Ngọc Duy | 2013-04-18 | 1 | -1/+1 |
* | pretty: support truncating in %>, %< and %>< | Nguyễn Thái Ngọc Duy | 2013-04-18 | 1 | -0/+46 |
* | utf8.c: add reencode_string_len() that can handle NULs in string | Nguyễn Thái Ngọc Duy | 2013-04-18 | 1 | -3/+7 |
* | utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences | Nguyễn Thái Ngọc Duy | 2013-04-18 | 1 | -6/+14 |
* | utf8.c: move display_mode_esc_sequence_len() for use by other functions | Nguyễn Thái Ngọc Duy | 2013-04-18 | 1 | -14/+14 |
* | Merge branch 'ks/rfc2047-one-char-at-a-time' | Junio C Hamano | 2013-03-25 | 1 | -0/+39 |
|\ | |||||
| * | format-patch: RFC 2047 says multi-octet character may not be split | Kirill Smelkov | 2013-03-09 | 1 | -0/+39 |
| * | Merge branch 'jc/same-encoding' into maint | Junio C Hamano | 2012-12-07 | 1 | -0/+7 |
| |\ | |||||
| * \ | Merge branch 'js/format-2047' into maint | Junio C Hamano | 2012-11-20 | 1 | -1/+1 |
| |\ \ | |||||
* | \ \ | Merge branch 'jk/utf-8-can-be-spelled-differently' | Junio C Hamano | 2013-03-21 | 1 | -2/+18 |
|\ \ \ \ | |||||
| * | | | | utf8: accept alternate spellings of UTF-8 | Jeff King | 2013-02-25 | 1 | -2/+18 |
| |/ / / | |||||
* | | | | Merge branch 'jx/utf8-printf-width' | Junio C Hamano | 2013-02-14 | 1 | -0/+21 |
|\ \ \ \ | |||||
| * | | | | Add utf8_fprintf helper that returns correct number of columns | Jiang Xin | 2013-02-11 | 1 | -0/+21 |
* | | | | | Merge branch 'sp/shortlog-missing-lf' | Junio C Hamano | 2013-01-02 | 1 | -7/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | strbuf_add_wrapped*(): Remove unused return value | Steffen Prohaska | 2012-12-11 | 1 | -7/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'jc/same-encoding' | Junio C Hamano | 2012-11-15 | 1 | -0/+7 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | reencode_string(): introduce and use same_encoding() | Junio C Hamano | 2012-11-04 | 1 | -0/+7 |
| | |/ | |/| | |||||
* | | | Merge branch 'js/format-2047' | Jeff King | 2012-11-09 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | utf8: fix off-by-one wrapping of text | Jan H. Schönherr | 2012-10-18 | 1 | -1/+1 |
* | | git on Mac OS and precomposed unicode | Torsten Bögershausen | 2012-07-08 | 1 | -10/+16 |
|/ | |||||
* | strbuf: add fixed-length version of add_wrapped_text | Jeff King | 2011-02-23 | 1 | -0/+9 |
* | Merge branch 'rs/optim-text-wrap' | Junio C Hamano | 2010-03-02 | 1 | -33/+28 |
|\ | |||||
| * | utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() | René Scharfe | 2010-02-20 | 1 | -6/+17 |
| * | utf8.c: remove strbuf_write() | René Scharfe | 2010-02-20 | 1 | -13/+5 |
| * | utf8.c: remove print_spaces() | René Scharfe | 2010-02-20 | 1 | -9/+6 |
| * | utf8.c: remove print_wrapped_text() | René Scharfe | 2010-02-20 | 1 | -5/+0 |
* | | utf8.c: mark file-local function static | Junio C Hamano | 2010-01-12 | 1 | -1/+1 |
|/ | |||||
* | strbuf_add_wrapped_text(): skip over colour codes | René Scharfe | 2009-11-23 | 1 | -1/+21 |