From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2014 21:24:40 +0000 (-0700)
Subject: Merge branch 'ks/config-file-stdin'
X-Git-Tag: v2.0.0-rc0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08f36302b5d04cf06a35acc91689b0278cbf6a73;p=thirdparty%2Fgit.git

Merge branch 'ks/config-file-stdin'

"git config" learned to read from the standard input when "-" is
given as the value to its "--file" parameter (attempting an
operation to update the configuration in the standard input of
course is rejected).

* ks/config-file-stdin:
  config: teach "git config --file -" to read from the standard input
  config: change git_config_with_options() interface
  builtin/config.c: rename check_blob_write() -> check_write()
  config: disallow relative include paths from blobs
---

08f36302b5d04cf06a35acc91689b0278cbf6a73