Unneeded branch history

Luca Siciliano Viglieri· Dec 10, 2008, 11:13 UTC · lore

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? Thanks

Luca Siciliano

Santi Béjar· Dec 10, 2008, 12:43 UTC · re: Luca Siciliano Viglieri · lore

Re: Unneeded branch history

2008/12/10 Luca Siciliano Viglieri <Luca.Siciliano@bittwister.com>:

Show 10 quoted lines

> 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