summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Kirill A. Shutemov <kirill@shutemov.name>2014-02-19 00:58:55 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-18 16:12:14 -0800
commit3caec73b5568341c5d8f303692423a8e9fb0cb39 (patch)
tree469a2cb5f3e8bdaf95832eaf846ba76926b8751c /git-merge-octopus.sh
parentconfig: change git_config_with_options() interface (diff)
downloadtgif-3caec73b5568341c5d8f303692423a8e9fb0cb39.tar.xz
config: teach "git config --file -" to read from the standard input
The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions