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

37a4d520 · Antoine Cellerier · 4a990366 · 37a4d520
Commit 37a4d520 authored Feb 11, 2010 by Antoine Cellerier
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

.gitmodules .gitmodules +4 -0

No files found.
--- a/.gitmodules
+++ b/.gitmodules
 [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