From mboxrd@z Thu Jan  1 00:00:00 1970
From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= 
	<ukleinek@informatik.uni-freiburg.de>
Subject: Re: git pull opinion
Date: Wed, 7 Nov 2007 08:06:46 +0100
Organization: Universitaet Freiburg, Institut f. Informatik
Message-ID: <20071107070646.GA3417@informatik.uni-freiburg.de>
References: <3abd05a90711051352t2f6be00bsa862585abd370fb1@mail.gmail.com> <4730AD48.2050907@obry.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: Aghiles <aghilesk@gmail.com>, git@vger.kernel.org
To: Pascal Obry <pascal@obry.net>
X-From: git-owner@vger.kernel.org Wed Nov 07 08:34:24 2007
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1IpfQa-0008Jl-V7
	for gcvg-git-2@gmane.org; Wed, 07 Nov 2007 08:34:21 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757629AbXKGHeG convert rfc822-to-quoted-printable (ORCPT
	<rfc822;gcvg-git-2@m.gmane.org>); Wed, 7 Nov 2007 02:34:06 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757623AbXKGHeE
	(ORCPT <rfc822;git-outgoing>); Wed, 7 Nov 2007 02:34:04 -0500
Received: from atlas.informatik.uni-freiburg.de ([132.230.150.3]:61978 "EHLO
	atlas.informatik.uni-freiburg.de" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1757552AbXKGHeA (ORCPT
	<rfc822;git@vger.kernel.org>); Wed, 7 Nov 2007 02:34:00 -0500
Received: from login.informatik.uni-freiburg.de ([132.230.151.6])
	by atlas.informatik.uni-freiburg.de with esmtps (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.68)
	(envelope-from <zeisberg@informatik.uni-freiburg.de>)
	id 1Ipezw-0004Ot-B3; Wed, 07 Nov 2007 08:06:48 +0100
Received: from login.informatik.uni-freiburg.de (localhost [127.0.0.1])
	by login.informatik.uni-freiburg.de (8.13.8+Sun/8.12.11) with ESMTP id lA776lUY003516;
	Wed, 7 Nov 2007 08:06:47 +0100 (MET)
Received: (from zeisberg@localhost)
	by login.informatik.uni-freiburg.de (8.13.8+Sun/8.12.11/Submit) id lA776k4j003515;
	Wed, 7 Nov 2007 08:06:46 +0100 (MET)
Mail-Followup-To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= <ukleinek@informatik.uni-freiburg.de>,
	Pascal Obry <pascal@obry.net>, Aghiles <aghilesk@gmail.com>,
	git@vger.kernel.org
Content-Disposition: inline
In-Reply-To: <4730AD48.2050907@obry.net>
User-Agent: Mutt/1.5.13 (2006-08-11)
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/63775>

Hello,

> I'm using:
>=20
> $ git config --global alias.update '!git stash && git pull && git sta=
sh apply'
I wonder how this works, if the merge produces conflicts...

Best regards
Uwe

--=20
Uwe Kleine-K=F6nig

http://www.google.com/search?q=3D1+year+in+days