Return-Path: X-Original-To: apmail-syncope-dev-archive@www.apache.org Delivered-To: apmail-syncope-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5A90310DDB for ; Tue, 20 Oct 2015 13:14:45 +0000 (UTC) Received: (qmail 71983 invoked by uid 500); 20 Oct 2015 13:14:32 -0000 Delivered-To: apmail-syncope-dev-archive@syncope.apache.org Received: (qmail 71941 invoked by uid 500); 20 Oct 2015 13:14:32 -0000 Mailing-List: contact dev-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list dev@syncope.apache.org Received: (qmail 71924 invoked by uid 99); 20 Oct 2015 13:14:32 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Oct 2015 13:14:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id EFD87C2D1A for ; Tue, 20 Oct 2015 13:14:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.002 X-Spam-Level: X-Spam-Status: No, score=0.002 tagged_above=-999 required=6.31 tests=[RP_MATCHES_RCVD=0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id VVwbYJbvEZen for ; Tue, 20 Oct 2015 13:14:24 +0000 (UTC) Received: from rovere.tirasa.net (rovere.tirasa.net [78.134.5.44]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id A2874206A7 for ; Tue, 20 Oct 2015 13:14:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by rovere.tirasa.net (Postfix) with ESMTP id B01AC300A7C54 for ; Tue, 20 Oct 2015 15:14:15 +0200 (CEST) Received: from rovere.tirasa.net ([127.0.0.1]) by localhost (rovere.tirasa.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id a7OxXaL9-Ctr for ; Tue, 20 Oct 2015 15:14:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by rovere.tirasa.net (Postfix) with ESMTP id 12AEF2FF251C5 for ; Tue, 20 Oct 2015 15:14:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at tirasa.net Received: from rovere.tirasa.net ([127.0.0.1]) by localhost (rovere.tirasa.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ohqh1XM9J9UP for ; Tue, 20 Oct 2015 15:14:10 +0200 (CEST) Received: from [192.168.1.104] (unknown [5.133.59.73]) by rovere.tirasa.net (Postfix) with ESMTPSA id 4574D2F71B345 for ; Tue, 20 Oct 2015 15:14:10 +0200 (CEST) To: dev@syncope.apache.org From: Massimiliano Perrone Subject: Prevent "merge commit" Message-ID: <56263E1B.5010909@tirasa.net> Date: Tue, 20 Oct 2015 15:14:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Hi Syncopers, maybe this mail could be useful at all. Few minutes ago Francesco committed just few seconds before my commit. In this way I got a merge commit. The latter means an empty commit in our "commits history". To prevent this situation Francesco suggested me to config the Git repository running "git config branch.master.rebase true" from Syncope base directory. In this way the repository is configured to have an automatic rebase running the git pull command. Massi -- Massimiliano Perrone Tel +39 393 9121310 Tirasa S.r.l. Viale D'Annunzio 267 - 65127 Pescara Tel +39 0859116307 / FAX +39 0859111173 http://www.tirasa.net "L'apprendere molte cose non insegna l'intelligenza" (Eraclito)