[Libreoffice-commits] .: Branch 'feature/submodules' - .gitmodules

[Norbert Thiebaud]

 .gitmodules |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit eda3cf7979b3f55ae150680dd965b248f5a4d369
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Mar 9 19:43:41 2012 -0600

    Revert "have the submodules rebase by default"
    
    This reverts commit acc0ca81477408dbeadcb121bc25e8e134b665b9.

diff --git a/.gitmodules b/.gitmodules
index c963415..8cdf2d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,9 @@
 [submodule "binfilter"]
 	path = binfilter
 	url = git://anongit.freedesktop.org/libreoffice/binfilter.git
-	update=rebase
 [submodule "dictionaries"]
 	path = dictionaries
 	url = git://anongit.freedesktop.org/libreoffice/dictionaries
-	update=rebase
 [submodule "helpcontent2"]
 	path = helpcontent2
 	url = git://anongit.freedesktop.org/libreoffice/help
-	update=rebase