[Libreoffice] [PATCH] download: prefer rebase instead of merge by default

[Miklos Vajna]

Hi Kendy (and others),

Given that I constantly forget to type git pull -r and bin/g pull -r
(the -r switch part is the problem for me), I thought it would be nice
to have these enabled by default.

OK to push the attached patch?

Thanks.
-------------- next part --------------
From 87153f310973cd975abd8db694d99150921ee5a7 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at frugalware.org>
Date: Wed, 6 Oct 2010 00:26:12 +0200
Subject: [PATCH] download: prefer rebase instead of merge by default

Let download set two configuration settings by default after each clone:

1) git pull will be git pull -r by default (you can use git pull
   --no-rebase if you want the old behaviour) for the master branch
2) the autosetup one is to have the same setting for every newly created
   branch

NOTE: Having this in the download script means that this will have an
effect only in newly cloned repos.
---
 download.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/download.in b/download.in
index 8d7e3b9..409140b 100755
--- a/download.in
+++ b/download.in
@@ -278,6 +278,8 @@ sub source_file_ooo($)
                          rm -f \"\$hook\"
                          ln -s \"../../../../git-hooks/\$file\" \"\$hook\"
                      fi
+		     git config branch.master.rebase true
+		     git config branch.autosetuprebase always
                  done" );
     }
     elsif ( '@SOURCE_TYPE@' eq "UPSTREAM" ) {
-- 
1.7.2.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20101006/0417b7d7/attachment.pgp>