Commit 37a4d520 authored by Antoine Cellerier's avatar Antoine Cellerier

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

parent 4a990366
[submodule "bindings/libvlcpp"] [submodule "bindings/libvlcpp"]
path = 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
# url = git@git.videolan.org:vlc/bindings/libvlcpp.git # url = git@git.videolan.org:vlc/bindings/libvlcpp.git
[submodule "bindings/jvlc"] [submodule "bindings/jvlc"]
path = 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
# url = git@git.videolan.org:vlc/bindings/jvlc.git # url = git@git.videolan.org:vlc/bindings/jvlc.git
[submodule "bindings/python"] [submodule "bindings/python"]
path = 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
# url = git@git.videolan.org:vlc/bindings/python.git # url = git@git.videolan.org:vlc/bindings/python.git
[submodule "bindings/phonon"] [submodule "bindings/phonon"]
path = 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
# url = git@git.videolan.org:vlc/bindings/phonon.git # url = git@git.videolan.org:vlc/bindings/phonon.git
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment