Merge branch 'mm/config-edit-global' into next
commitecce1c7889cb5b9ef99409f8e4cad4613dd48eb9
authorJunio C Hamano <gitster@pobox.com>
Thu, 31 Jul 2014 17:58:11 +0000 (31 10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 31 Jul 2014 17:58:11 +0000 (31 10:58 -0700)
tree1b7cc81003c981aa648a90e9da8fb40b99180774
parent6edc3bc938edaff58cf654a5a985b6b018cb132c
parent8b27ff7eacc3bafcb12afcd6bbc99cdb8d718a26
Merge branch 'mm/config-edit-global' into next

* mm/config-edit-global:
  commit: advertise config --global --edit on guessed identity
  home_config_paths(): let the caller ignore xdg path
  config --global --edit: create a template file if needed
builtin/commit.c
builtin/config.c
cache.h
path.c