summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff-highlight: do not split multibyte charactersjk/colorsKyle J. McKay2015-04-041-2/+7
* parse_color: fix return value for numeric color values 0-8Jeff King2015-01-202-0/+5
* parse_color: drop COLOR_BACKGROUND macroJeff King2014-12-091-5/+4
* diff-highlight: allow configurable colorsJeff King2014-11-202-13/+90
* parse_color: recognize "no$foo" to clear the $foo attributeJeff King2014-11-204-6/+20
* parse_color: support 24-bit RGB valuesJeff King2014-11-204-5/+37
* parse_color: refactor color storageJeff King2014-11-201-32/+106
* Merge branch 'jn/parse-config-slot' into jk/colorsJunio C Hamano2014-11-2013-50/+47
|\
| * color_parse: do not mention variable name in error messagejn/parse-config-slotJeff King2014-10-1411-28/+26
| * pass config slots as pointers instead of offsetsJonathan Nieder2014-10-145-22/+21
* | t4026: test "normal" colorjk/colors-fixJeff King2014-11-201-0/+8
* | config: fix parsing of "git config --get-color some.key -1"Jeff King2014-11-201-14/+13
* | docs: describe ANSI 256-color modeJeff King2014-11-201-0/+4
* | Merge branch 'nd/gitignore-trailing-whitespace' into maintJunio C Hamano2014-11-121-1/+1
|\ \
| * | gitignore.txt: fix spelling of "backslash"nd/gitignore-trailing-whitespaceBen North2014-11-041-1/+1
* | | Merge branch 'rs/clean-menu-item-defn' into maintJunio C Hamano2014-11-111-1/+1
|\ \ \
| * | | clean: use f(void) instead of f() to declare a pointer to a function without ...rs/clean-menu-item-defnRené Scharfe2014-08-181-1/+1
* | | | Documentation/config.txt: fix minor typoThomas Quinot2014-11-101-1/+1
* | | | config.txt: fix typoNicolas Dermine2014-11-101-1/+1
* | | | docs/credential-store: s/--store/--file/Jeff King2014-11-061-1/+1
* | | | Git 2.1.3v2.1.3Junio C Hamano2014-10-294-3/+30
* | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintJunio C Hamano2014-10-292-0/+10
|\ \ \ \
| * | | | pack-objects: turn off bitmaps when we split packsjk/pack-objects-no-bitmap-when-splittingJeff King2014-10-192-0/+10
* | | | | Merge branch 'da/mergetool-meld' into maintJunio C Hamano2014-10-292-2/+16
|\ \ \ \ \
| * | | | | mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-162-2/+16
* | | | | | Merge branch 'rm/gitweb-start-form' into maintJunio C Hamano2014-10-291-2/+2
|\ \ \ \ \ \
| * | | | | | gitweb: use start_form, not startform that was removed in CGI.pm 4.04rm/gitweb-start-formRoland Mas2014-10-161-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bc/asciidoc-pretty-formats-fix' into maintJunio C Hamano2014-10-291-1/+1
|\ \ \ \ \ \
| * | | | | | Documentation: fix misrender of pretty-formats in Asciidoctorbc/asciidoc-pretty-formats-fixbrian m. carlson2014-10-081-1/+1
* | | | | | | Merge branch 'rs/daemon-fixes' into maintJunio C Hamano2014-10-291-18/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | daemon: remove write-only variable maxfdrs/daemon-fixesRené Scharfe2014-10-011-4/+0
| * | | | | | daemon: fix error message after bind()René Scharfe2014-10-011-1/+1
| * | | | | | daemon: handle gethostbyname() errorRené Scharfe2014-10-011-13/+14
* | | | | | | Merge branch 'maint-2.0' into maintJunio C Hamano2014-10-071-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'maint-1.9' into maint-2.0Junio C Hamano2014-10-071-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-10-071-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | git-tag.txt: Add a missing hyphen to `-s`Wieland Hoffmann2014-10-071-1/+1
| | | |/ / / / /
* | | | | | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-076-1/+66
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | mailinfo: work around -Wstring-plus-int warningjk/mbox-from-lineEric Sunshine2014-09-221-1/+2
| * | | | | | | mailinfo: make ">From" in-body header check more robustJeff King2014-09-166-1/+65
* | | | | | | | Git 2.1.2v2.1.2Junio C Hamano2014-09-294-3/+24
* | | | | | | | Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-293-9/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | fsck: return non-zero status on missing ref tipsjk/fsck-exit-code-fixJeff King2014-09-122-1/+58
| * | | | | | | | fsck: exit with non-zero status upon error from fsck_obj()Jeff King2014-09-103-8/+29
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-294-7/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fixJeff King2014-09-113-7/+21
| * | | | | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-183-2/+22
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-292-0/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | reachable.c: add HEAD to reachability starting commitsmk/reachable-protect-detached-headMax Kirillov2014-09-032-0/+25
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-292-1/+109
|\ \ \ \ \ \ \ \
View Lorry Controller Status