From: MALET Jean-Luc Date: Mon, 11 May 2009 22:11:29 GMT Subject: Re: merging multiple commit into one? Message-ID: <4A08A291.2060009@gmail.com> In-Reply-To: Jakub Narebski wrote: > jean-luc malet writes: > > >> 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). > > 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 ;) thanks JLM