aboutsummaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-02-10 21:40:53 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-02-10 21:40:53 +0100
commit1cb02ebcaa4891c01a1d6cba11a3cd9806fad782 (patch)
tree51130c659e5089434e84404940ed1451f6c5d5cc /.gitmodules
parent660bdca125aa9dcca7a7730535bec433edb8ba02 (diff)
parentf77230f618722e964a76657ebb03d822b2f73518 (diff)
downloadGitPython-1cb02ebcaa4891c01a1d6cba11a3cd9806fad782.tar.gz
GitPython-1cb02ebcaa4891c01a1d6cba11a3cd9806fad782.zip
Merge branch 'feature/spaces-and-cleanup-master'
* feature/spaces-and-cleanup-master: Basic fixes to get tests back on track. Of course there is much more work to be done here removed leftover gitdb - I thought it was merged into git tabs to 4 spaces - overall state of this branch is desolate, but fixable. Needs plenty of work
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 7ad13154..95c6a160 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,8 @@
[submodule "async"]
path = git/ext/async
url = http://github.com/gitpython-developers/async.git
+ branch = master
[submodule "smmap"]
path = git/ext/smmap
url = http://github.com/Byron/smmap.git
+ branch = master