From: Antoine Cellerier Date: Thu, 11 Feb 2010 14:28:45 +0000 (+0100) Subject: Default to rebase on submodule updates to prevent losing local changes. X-Git-Tag: 1.1.0-ff~173 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=37a4d52044737bfaac6140a8e0a65d8f4e22987d;p=vlc Default to rebase on submodule updates to prevent losing local changes. --- diff --git a/.gitmodules b/.gitmodules index 3885a64380..cae9a1013d 100644 --- 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