2008/12/10 Luca Siciliano Viglieri <Luca.Siciliano@xxxxxxxxxxxxxx>: > Hi, > i have tried to find a solution to my problem, but i couldn't find > anything on the documentation. > I have created from master branch a development branch. I keep the master > branch regularly uptodate from the server and in the development branch i > commit my code. When i merge the two branches i obtain a commit with two > parents and when i push my master branch to the server, all my development > history it is also saved in the server. > Can i avoid saving my develoment history, at least on the server, so that > the master branch has only one parent commits? $ git merge --squash or $ git rebase -i master and squash/edit/... some of the revisions (this way you can have the interesting development history) HTH, Santi -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
