aboutsummaryrefslogtreecommitdiff
path: root/t/t3320-notes-merge-worktrees.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-24 12:57:52 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-24 12:57:52 -0700
commitf3d5bbb28322307592f9e5f5f21e69ff0249eea7 (patch)
treec5b8918e92baf9943e7e4723f3229a002b604dd0 /t/t3320-notes-merge-worktrees.sh
parentf4d3af185988ad45ebc0a6dead32222cad2c03a6 (diff)
parent5ea304896e1e2bfbf104c4098df70f93b5952cfa (diff)
downloadgit-f3d5bbb28322307592f9e5f5f21e69ff0249eea7.tar.gz
git-f3d5bbb28322307592f9e5f5f21e69ff0249eea7.tar.xz
Merge branch 'sb/submodule-config-parse-ignore-fix' into maint
Code to read submodule.<name>.ignore config did not state the variable name correctly when giving an error message diagnosing misconfiguration. * sb/submodule-config-parse-ignore-fix: submodule-config: correct error reporting for invalid ignore value
Diffstat (limited to 't/t3320-notes-merge-worktrees.sh')
0 files changed, 0 insertions, 0 deletions