| commit | 62ce40d9338046a89de5d2bfb6b258872fd366c0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Nov 2014 19:40:29 +0000 (20 11:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Nov 2014 19:40:29 +0000 (20 11:40 -0800) | ||
| tree | caec918aacac7203a8d8c25145b412b9fed6a8cc | treesnapshot (tar.gz zip) |
| parent | cb357221a402c55b23bf99ec9f3b361709d45fa7 | commitdiff |
| parent | f6c5a2968c103621adf6928a29e4895361eaa23b | commitdiff |
Merge branch 'jn/parse-config-slot' into jk/colors
* jn/parse-config-slot:
color_parse: do not mention variable name in error message
pass config slots as pointers instead of offsets
* jn/parse-config-slot:
color_parse: do not mention variable name in error message
pass config slots as pointers instead of offsets
| builtin/clean.c | diff1 | diff2 | blobhistory |
| builtin/config.c | diff1 | diff2 | blobhistory |