X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient:	geda-user AT delorie DOT com
X-TCPREMOTEIP:	207.224.51.38
X-Authenticated-UID:	jpd AT noqsi DOT com
Mime-Version:	1.0 (Mac OS X Mail 7.3 \(1878.6\))
Subject:	Re: [geda-user] pcb alternatives
From:	John Doty <jpd AT noqsi DOT com>
In-Reply-To:	<5509CBB0.1080007@neurotica.com>
Date:	Wed, 18 Mar 2015 16:24:01 -0600
Message-Id:	<74186D74-4B5D-4FE8-91B4-93699E978BE5@noqsi.com>
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> <5509CBB0 DOT 1080007 AT neurotica DOT com>
To:	geda-user AT delorie DOT com
X-Mailer:	Apple Mail (2.1878.6)
X-MIME-Autoconverted:	from quoted-printable to 8bit by delorie.com id t2IMO8PE008209
Reply-To:	geda-user AT delorie DOT com
Errors-To:	nobody AT delorie DOT com
X-Mailing-List:	geda-user AT delorie DOT com
X-Unsubscribes-To:	listserv AT delorie DOT com

On Mar 18, 2015, at 1:02 PM, Dave McGuire <mcguire AT neurotica DOT com> wrote:

> 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.

It’s not usually that bad unless you must fight the paradigm.

John Doty              Noqsi Aerospace, Ltd.
http://www.noqsi.com/
jpd AT noqsi DOT com

- Raw text -