From: "Josh Boyer" <jwboyer@gmail.com>
To: "Alex Riesen" <raa.lkml@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: Lump commit HOWTO?
Date: Fri, 13 Jul 2007 08:43:15 -0500 [thread overview]
Message-ID: <625fc13d0707130643v1fb739bejb894648dcf16bd3@mail.gmail.com> (raw)
In-Reply-To: <20070713045447.GA2430@steel.home>
On 7/12/07, Alex Riesen <raa.lkml@gmail.com> wrote:
> Josh Boyer, Fri, Jul 13, 2007 03:21:17 +0200:
> > 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.
>
> See git merge --squash. It is exactly that.
Hm, OK. I'll have to play with that.
> Also git-rebase --interactive and git cherry-pick -n can help you to
> get the same.
Gah... I totally missed git rebase. Looks massively useful. Thanks!
josh
next prev parent reply other threads:[~2007-07-13 13:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-13 1:21 Lump commit HOWTO? Josh Boyer
2007-07-13 4:54 ` Alex Riesen
2007-07-13 13:43 ` Josh Boyer [this message]
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=625fc13d0707130643v1fb739bejb894648dcf16bd3@mail.gmail.com \
--to=jwboyer@gmail.com \
--cc=git@vger.kernel.org \
--cc=raa.lkml@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 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.