all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stephen Berman <stephen.berman@gmx.net>
To: Andreas Schwab <schwab@suse.de>
Cc: martin rudalics <rudalics@gmx.at>, emacs-devel@gnu.org
Subject: Re: need help adjusting workflow to git (or vice versa)
Date: Thu, 13 Nov 2014 20:51:03 +0100	[thread overview]
Message-ID: <87oasaubfc.fsf@rosalinde.fritz.box> (raw)
In-Reply-To: <mvmmw7v2gr4.fsf@hawking.suse.de> (Andreas Schwab's message of "Thu, 13 Nov 2014 17:43:27 +0100")

On Thu, 13 Nov 2014 17:43:27 +0100 Andreas Schwab <schwab@suse.de> wrote:

> martin rudalics <rudalics@gmx.at> writes:
>
>>> So how can I (i) keep a
>>> pristine copy of trunk (master) and (ii) build with possibly some local
>>> changes but without all changes from the task branch?
>>
>> From what I understand from here
>>
>> http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00790.html
>>
>> and subsequent comments you have to make a spearate clone.
>
> You can also use git new-workdir (not yet part of the git core, a proper
> replacement is being worked on).

I would be very surprised if either of these approaches is used by most
developers using git, because if so, I'd have expected them to be part
of the standard toolkit and well documented.  So I think my workflow is
suboptimal for git.  What do people who have several branches of a
single project repository and want to build from one of them without
including changes from another in the build usually do?  Isn't that a
common scenario, especially for Emacs developers?  What do you people do?

Steve Berman



  reply	other threads:[~2014-11-13 19:51 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-13 15:35 need help adjusting workflow to git (or vice versa) Stephen Berman
2014-11-13 15:49 ` Kelvin White
2014-11-13 19:50   ` Stephen Berman
2014-11-13 20:53     ` Kelvin White
2014-11-13 16:29 ` martin rudalics
2014-11-13 16:43   ` Andreas Schwab
2014-11-13 19:51     ` Stephen Berman [this message]
2014-11-13 20:10       ` Paul Eggert
2014-11-13 20:44         ` Stephen Berman
2014-11-13 20:58           ` Paul Eggert
2014-11-13 21:19             ` Stephen Berman
2014-11-13 20:58           ` Harald Hanche-Olsen
2014-11-13 21:22           ` Stefan Monnier
2014-11-14  5:26           ` Eli Zaretskii
2014-11-15 22:24             ` Stephen Berman
2014-11-16 18:57               ` Bill Wohler
2014-11-14  5:18       ` Rob Browning
2014-11-18  9:34         ` Eric S Fraga
2014-11-15  5:08       ` Bill Wohler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87oasaubfc.fsf@rosalinde.fritz.box \
    --to=stephen.berman@gmx.net \
    --cc=emacs-devel@gnu.org \
    --cc=rudalics@gmx.at \
    --cc=schwab@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.