[Libreoffice-commits] .: Branch 'libreoffice-3-3' - autogen.sh

[Jan Holesovsky]

 autogen.sh |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit a2001222b8e0a11c86a8db975c603dfe41a9c859
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 25 21:17:27 2010 +0100

    autogen: Do not setup autorebase for git's pull any more.

diff --git a/autogen.sh b/autogen.sh
index c4bdb86..141e4cb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -47,6 +47,4 @@ if [ -d .git ] ; then
             ln -s "../../git-hooks/$file" "$hook"
         fi
     done
-    git config branch.master.rebase true
-    git config branch.autosetuprebase always
 fi