git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Josh Boyer" <jwboyer@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Subject: Lump commit HOWTO?
Date: Thu, 12 Jul 2007 20:21:17 -0500	[thread overview]
Message-ID: <625fc13d0707121821l70e2d6aaw555c79b5d700585f@mail.gmail.com> (raw)

Hi All,

I have a specific workflow in mind that I'm not entirely sure how to
accomplish with git.  What I'd like to do is track a project in a
local branch, and do commits of my own there as well.  Then when I'm
ready to submit the work, I want to take all the incremental commits
and lump them into a single new commit and push that out as a patch or
into a branch for people to pull from.

E.g.

1) clone upstream into foo branch
2) commit A
3) commit B
4) pull upstream changes into foo branch
5) commit C
6) commit D
7) repeat steps 2 - 6 in various orders
8) take all local commits (A - D) and create a single commit without
any of the upstream changes in it

Is something like that easily accomplished?  Or perhaps a different
workflow that would allow similar results?

josh

             reply	other threads:[~2007-07-13  1:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-13  1:21 Josh Boyer [this message]
2007-07-13  4:54 ` Lump commit HOWTO? Alex Riesen
2007-07-13 13:43   ` Josh Boyer
2007-07-13  6:09 ` martin f krafft

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=625fc13d0707121821l70e2d6aaw555c79b5d700585f@mail.gmail.com \
    --to=jwboyer@gmail.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 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).