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

Re: merging multiple commit into one?

From
Jakub Narebski <jnareb@gmail.com>
Date
May 11, 2009, 13:50 UTC
Message-ID
<m38wl3n3zj.fsf@localhost.localdomain>
In-Reply-To
<1de9d39c0905110621p6858bca8y8bb036a167754672@mail.gmail.com>
jean-luc malet <jeanluc.malet@gmail.com> writes:
Show 9 quoted lines
> Hi,
> I often commit "useless" code, for example before going into weekend
> or for saving some state during a dev process
> often thoses commit are simply useless and the commit message looks
> like "COMPILE ERROR - temporary save .... "
> at the end I have LOT of theses commits that are useless and I want to
> save some space/time/tree complexity merge multiple sequential commits
> (without branch) into one
> is it possible?

It is possible; one solution would be to use "git rebase --interactive" and its 'squash' command...

> according to my knowledge of git, removing the commit and rewriting
> the last commit log so that it better reflect the modification will do
> the job but I'm not sure git allow it...

...but you can simply pick up where you saved snapshot by using "git commit --amend" (or doing soft or mixed reset to previous commit before comitting changes).

-- 
Jakub Narebski
Poland
ShadeHawk on #git
Previous: Andreas EricssonNext: MALET Jean-Luc
Message 3 of 10 in “merging multiple commit into one?”
  1. jean-luc maletMay 11, 2009
  2. Andreas EricssonMay 11, 2009
  3. Jakub NarebskiMay 11, 2009
  4. MALET Jean-LucMay 11, 2009
  5. Jakub NarebskiMay 11, 2009
  6. jean-luc maletMay 12, 2009
  7. Heiko VoigtMay 11, 2009
  8. MALET Jean-LucMay 11, 2009
  9. Heiko VoigtMay 12, 2009
  10. Markus HeidelbergMay 12, 2009

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.