git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Lump commit HOWTO?

From
JBJosh Boyer <jwboyer@gmail.com>
Date
Jul 13, 2007, 13:43 UTC
Message-ID
<625fc13d0707130643v1fb739bejb894648dcf16bd3@mail.gmail.com>
In-Reply-To
<20070713045447.GA2430@steel.home>
On 7/12/07, Alex Riesen <raa.lkml@gmail.com> wrote:
Show 11 quoted lines
> 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
Previous: Alex RiesenNext: martin f krafft
Message 3 of 4 in “Lump commit HOWTO?”
  1. Josh BoyerJul 13, 2007
  2. Alex RiesenJul 13, 2007
  3. Josh BoyerJul 13, 2007
  4. martin f krafftJul 13, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.