Default to rebase on submodule updates to prevent losing local changes.

diff --git a/.gitmodules b/.gitmodules
index 3885a64380eaaa6a9ec0311a1c721ba377e7e20e..cae9a1013da864693ddc218b8c299a4103772799 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,20 @@
 [submodule "bindings/libvlcpp"]
        path = bindings/libvlcpp
+       update = rebase
        url = git://git.videolan.org/vlc/bindings/libvlcpp.git
 #      url = git@git.videolan.org:vlc/bindings/libvlcpp.git
 [submodule "bindings/jvlc"]
        path = bindings/jvlc
+       update = rebase
        url = git://git.videolan.org/vlc/bindings/jvlc.git
 #      url = git@git.videolan.org:vlc/bindings/jvlc.git
 [submodule "bindings/python"]
        path = bindings/python
+       update = rebase
        url = git://git.videolan.org/vlc/bindings/python.git
 #      url = git@git.videolan.org:vlc/bindings/python.git
 [submodule "bindings/phonon"]
        path = bindings/phonon
+       update = rebase
        url = git://git.videolan.org/vlc/bindings/phonon.git
 #      url = git@git.videolan.org:vlc/bindings/phonon.git