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, 22:36 UTC
Message-ID
<200905120036.06965.jnareb@gmail.com>
In-Reply-To
<4A08A291.2060009@gmail.com>
On Tue, 12 May 2009, MALET Jean-Luc wrote:
> Jakub Narebski wrote:
>> jean-luc malet <jeanluc.malet@gmail.com> writes:
Show 8 quoted lines
>>> 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...
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   
Show 23 quoted lines
>>> 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).
>>
>>   
> hi! thanks for your answers!
> I didn't knew about --amend for commit, will certainly use it...
> however it seems that I get missunderstood...
> A-o-o-o-o-o-B-o-o-o-o-C
>                       \-o-o-D-/
> let say I have the above tree, o are temporary unbuildable commits, A B 
> C D are usable versions
> I want as posteriory remove the o to get the following tree
> A-B---C
>      \-D/
> in fact I just wanna clean a little my tree since I forgot to amend ;)
> is this possible?
> ok I know, the best is to prevent! not to cure! so I'll amend ;)
As I wrote above, you can use interactive rebase to clean up history.
-- 
Jakub Narebski
Poland
Previous: MALET Jean-LucNext: jean-luc malet
Message 5 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.