git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Howard Miller <howard@e-learndesign.co.uk>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Any way to "flatten" a series of changes in git
Date: Fri, 23 Oct 2009 06:40:30 +0100	[thread overview]
Message-ID: <26ae428a0910222240w7956e57dn325afcdd15aa2cb@mail.gmail.com> (raw)
In-Reply-To: <26ae428a0910222236l58bc64b7l12c4cff09b086dac@mail.gmail.com>

>
> Hi Jakub,
>
> Yes it helps a lot. What I *don't* care about (or want to do) is
> actually do a merge or a rebase I just want to change history. Well,
> that's what I thought I wanted. What I suppose I really want is the
> full history for *me* and a second branch with the 'reduced' history
> to push to my client.  I suppose that's different yet again?
>
> Howard
>

Actually, what I should have said in the first place is that this is
specifically nothing to do with the main trunk. We are doing small
custom developments for clients away from the main project
development. So we specifically don't want to merge or rebase with the
master - that's never going to happen. I want to keep the development
branch in tact for my reference, but when I push (the custom
development branch) to the client I need that sanitized. I think I
finally have it clear in my own head now!

Howard

  reply	other threads:[~2009-10-23  5:40 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-22 20:03 Any way to "flatten" a series of changes in git Howard Miller
2009-10-22 20:30 ` Bill Lear
2009-10-22 20:44   ` Bill Lear
2009-10-22 20:51     ` Jacob Helwig
2009-10-22 20:58       ` Howard Miller
2009-10-26 13:42         ` Daniele Segato
2009-10-22 20:59 ` Jakub Narebski
2009-10-22 21:11   ` Howard Miller
2009-10-22 21:24     ` Howard Miller
2009-10-22 21:57     ` Jakub Narebski
2009-10-23  5:36       ` Howard Miller
2009-10-23  5:40         ` Howard Miller [this message]
2009-10-23  5:48     ` Johannes Sixt
2009-10-23  6:16       ` Junio C Hamano

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=26ae428a0910222240w7956e57dn325afcdd15aa2cb@mail.gmail.com \
    --to=howard@e-learndesign.co.uk \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).