summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-19 11:44:39 -0700
committerJunio C Hamano <gitster@pobox.com>2015-08-19 11:45:08 -0700
commit5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5 (patch)
tree69e47a672d37c3e818c8516bd1529e33dcf2f34b /.gitignore
parentf932729cc7707390f4d6739be1573e93ceb9df22 (diff)
parent027771fcb153e0003bcb2d68e1838594a48b0161 (diff)
downloadgit-5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5.tar.gz
Merge 'hv/submodule-config' to 'sb/submodule-helper'
* hv/submodule-config: submodule: allow erroneous values for the fetchRecurseSubmodules option submodule: use new config API for worktree configurations submodule: extract functions for config set and lookup submodule: implement a config API for lookup of .gitmodules values
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a685ec1fb0..4fd81baf85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -205,6 +205,7 @@
/test-sha1-array
/test-sigchain
/test-string-list
+/test-submodule-config
/test-subprocess
/test-svn-fe
/test-urlmatch-normalization