]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb35722 f6c5a29)
Merge branch 'jn/parse-config-slot' into jk/colors
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Nov 2014 19:40:29 +0000 (11:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Nov 2014 19:40:29 +0000 (11:40 -0800)
commit62ce40d9338046a89de5d2bfb6b258872fd366c0
treecaec918aacac7203a8d8c25145b412b9fed6a8cctree | snapshot
parentcb357221a402c55b23bf99ec9f3b361709d45fa7commit | diff
parentf6c5a2968c103621adf6928a29e4895361eaa23bcommit | diff
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
builtin/clean.c diff1 | diff2 | blob | history
builtin/config.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.