X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient:	geda-user AT delorie DOT com
X-Virus-Scanned:	amavisd-new at neurotica.com
X-NSA-prism-xkeyscore:	I do not consent to surveillance, prick
DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/simple; d=neurotica.com;
	s=default; t=1426705328;
	bh=QhuNpVkG1265nS+LhooFeSyWQOuSTl7QWOjEJt4oGmo=;
	h=Date:From:To:Subject:References:In-Reply-To;
	b=NoXCSzHnblCWJg7d4zh83P2UV9t1VRM+xX8kTc9dyyX2uXJTethjtrylbq0nNyQSQ
	GlU4n6fupDn24Pl1iWwK48YdI9clisg3MDIZ8INq4RnIkbq+lzZeXSZQ8SksXbnFBK
	QSJeS97f8ipzr5RXQBsPfNDObDig7Ft9/3LYAppo=
Message-ID:	<5509CBB0.1080007@neurotica.com>
Date:	Wed, 18 Mar 2015 15:02:08 -0400
From:	Dave McGuire <mcguire AT neurotica DOT com>
User-Agent:	Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0
MIME-Version:	1.0
To:	geda-user AT delorie DOT com
Subject:	Re: [geda-user] pcb alternatives
References:	<CAGYR9veihi_M+B0HXptGYQLMO8=B_KOLM2wmrRNkMLG_9MdQrA AT mail DOT gmail DOT com> <alpine DOT DEB DOT 2 DOT 00 DOT 1503180357520 DOT 25799 AT igor2priv> <CAGYR9ve_n7VmZ8x-jCQK5eKHMNGp6an9o8EwYZnWQWFiCpGnXg AT mail DOT gmail DOT com> <alpine DOT DEB DOT 2 DOT 00 DOT 1503180827170 DOT 25799 AT igor2priv> <CAC4O8c--CeEiKjxCKrs38XGjOyPS0Cy6scZ5HsAFgpi5xDpP_w AT mail DOT gmail DOT com> <201503181619 DOT t2IGJkZD012945 AT envy DOT delorie DOT com> <20150318165331 DOT 25228 DOT qmail AT stuge DOT se> <201503181709 DOT t2IH9StK014643 AT envy DOT delorie DOT com> <20150318174247 DOT 29231 DOT qmail AT stuge DOT se> <201503181744 DOT t2IHi8Im015958 AT envy DOT delorie DOT com> <20150318184822 DOT 2124 DOT qmail AT stuge DOT se>
In-Reply-To:	<20150318184822.2124.qmail@stuge.se>
Reply-To:	geda-user AT delorie DOT com

On 03/18/2015 02:48 PM, Peter Stuge wrote:
>>> What do you want?
>>
>> I want "git update" to do what "cvs update" and "svn update" does -
>> update the source tree under my work-in-progress.
> 
> I think this:
> 
> git config --global alias.update \
> 	'!git stash -a && git pull --rebase && git stash pop --index'
> 
> might do what you want. The only gotcha is that if your WIP stash
> conflicts with what you've pulled, the stash will not get dropped.
> You can just leave it sitting there, it doesn't matter too much.

  My God.

  I myself will be sticking with SVN.

            -Dave

-- 
Dave McGuire, AK4HZ/3
New Kensington, PA

- Raw text -