X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
Date: Wed, 18 Mar 2015 14:07:30 -0400
Message-Id: <201503181807.t2II7UC6017342@envy.delorie.com>
From: DJ Delorie <dj AT delorie DOT com>
To: geda-user AT delorie DOT com
In-reply-to: <53C889EB-3FFA-4785-8298-C0EE0EEFAD67@noqsi.com> (message from
	John Doty on Wed, 18 Mar 2015 12:00:48 -0600)
Subject: Re: [geda-user] pcb alternatives
References: <5508413E DOT 4000405 AT ecosensory DOT com> <46050a0c DOT 619 DOT 14c2850d052 DOT Webtop DOT 45 AT optonline DOT net> <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> <53C889EB-3FFA-4785-8298-C0EE0EEFAD67 AT noqsi DOT com>
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
Precedence: bulk


> > I want "git update" to do what "cvs update" and "svn update" does -
> > update the source tree under my work-in-progress.
> 
> git pull $rebase

That doesn't work under a work-in-progress, you have to stash first,
then apply your stash, assuming git lets you (conflicts).