summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorPavel Roskin <plroskin@gmail.com>2017-02-26 22:01:31 -0800
committerjsorg71 <jay.sorg@gmail.com>2017-03-01 20:38:33 -0800
commit865676a026837d738e423caff4781632568091c7 (patch)
tree8522b8a0220b75b435c65c12d75a4c2e64ce0482 /.gitmodules
parent096baec33142ccae6bd3a3a0877b4b1a870a51f8 (diff)
downloadxrdp-proprietary-865676a026837d738e423caff4781632568091c7.tar.gz
xrdp-proprietary-865676a026837d738e423caff4781632568091c7.zip
Use special name "." for the branches in .gitmodules
It is used to indicate that the submodule branch should be the same as the branch of the parent repository - devel for devel, master for master. It's a new feature of git, appearing in version 2.10, but most users should not really care. It only affects the behavior of "git submodule update --remote" when updating the submodules.
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 7ced6a8e..5962601a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,11 @@
[submodule "librfxcodec"]
path = librfxcodec
url = https://github.com/neutrinolabs/librfxcodec.git
+ branch = .
ignore = untracked
[submodule "libpainter"]
path = libpainter
url = https://github.com/neutrinolabs/libpainter.git
- branch = devel
+ branch = .
ignore = untracked