All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Steven E. Harris" <seh@panix.com>
To: git@vger.kernel.org
Subject: Re: With feature branches, what is ever committed directly to master
Date: Fri, 13 Aug 2010 18:19:30 -0400	[thread overview]
Message-ID: <m2ocd6yx3h.fsf@Spindle.sehlabs.com> (raw)
In-Reply-To: AANLkTinwQhD-b0-6uQYwBa3r7psNvPp5LMcjqHVKLF+c@mail.gmail.com

Jon Seymour <jon.seymour@gmail.com> writes:

> Otherwise, I keep them clean and merge them into the base of my
> working branch (as described into an earlier note).  By always merging
> into the base of my working branch (and never the tip) I can keep my
> working tree stable and my patches clean.

Can you clarify what you mean by "merging into the base" and "never the
tip"? Perhaps a pointer to the earlier note you mentioned would suffice.

-- 
Steven E. Harris

  reply	other threads:[~2010-08-13 22:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-10 19:02 With feature branches, what is ever committed directly to master Bradley Wagner
2010-08-10 19:15 ` Michael Witten
2010-08-11  1:05 ` David Ripton
2010-08-11  3:02 ` Jon Seymour
2010-08-13 22:19   ` Steven E. Harris [this message]
2010-08-13 23:52     ` Jon Seymour
2010-08-11  6:57 ` Magnus Bäck
2010-08-11  9:21   ` Jon Seymour
2010-08-11 14:48 ` Tim Visher

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=m2ocd6yx3h.fsf@Spindle.sehlabs.com \
    --to=seh@panix.com \
    --cc=git@vger.kernel.org \
    /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.
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.