[Libreoffice-commits] .: Branch 'libreoffice-3-3' - download.in

[Miklos Vajna]

 download.in |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit d3f2ac4bb3df4efb14f70800b65183d80555258c
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Fri Nov 19 01:12:52 2010 +0100

    Revert "autogen/download: prefer rebase instead of merge by default"
    
    This reverts commit 7f24ede9ec00fea0482abc74a131d41c5578a915. See the
    mailing list, it turns out to be too dangerous.

diff --git a/download.in b/download.in
index 8e78c10..1cdf939 100755
--- a/download.in
+++ b/download.in
@@ -298,7 +298,6 @@ sub source_file_ooo($)
                          ln -s \"../../../../git-hooks/\$file\" \"\$hook\"
                      fi
                  done" );
-        system( "cd @CLONEDIR@/$what ; git config branch.master.rebase true; git config branch.autosetuprebase always" );
     }
     elsif ( '@SOURCE_TYPE@' eq "UPSTREAM" ) {
         die "Up-stream doesn't have a package split" if ($SPLIT);