[vlc-devel] commit: Default to rebase on submodule updates to prevent losing local changes. ( Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Thu Feb 11 15:28:45 2010 +0100| [37a4d52044737bfaac6140a8e0a65d8f4e22987d] | committer: Antoine Cellerier 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=37a4d52044737bfaac6140a8e0a65d8f4e22987d
---

 .gitmodules |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3885a64..cae9a10 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 at 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 at 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 at 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 at git.videolan.org:vlc/bindings/phonon.git