Merge branch 'jn/parse-config-slot'
commitb94657683996402228abb1694a5db4792c424f9e
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Oct 2014 19:23:48 +0000 (20 12:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Oct 2014 19:23:48 +0000 (20 12:23 -0700)
treea553b8703be639bf1af8c74946337a5ebe08529f
parentb67588d018441d1485378a7d9b460401ba8b76a5
parentf6c5a2968c103621adf6928a29e4895361eaa23b
Merge branch 'jn/parse-config-slot'

Code cleanup.

* jn/parse-config-slot:
  color_parse: do not mention variable name in error message
  pass config slots as pointers instead of offsets
builtin/branch.c
builtin/clean.c
builtin/commit.c
builtin/config.c
builtin/for-each-ref.c
builtin/log.c
diff.c
log-tree.c
log-tree.h
pretty.c