{"thread":{"id":"16663","subject":"Unneeded branch history","startedAt":"2008-12-10T11:13:27Z","lastAt":"2008-12-10T12:43:09Z","messageCount":2,"participants":["Luca Siciliano Viglieri","Santi Béjar"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"97482","messageId":"50628.127.0.0.1.1228907607.squirrel@localhost","threadId":"16663","inReplyTo":null,"subject":"Unneeded branch history","fromName":"Luca Siciliano Viglieri","fromEmail":"luca.siciliano@bittwister.com","sentAt":"2008-12-10T11:13:27Z","receivedAt":"2008-12-10T11:13:27Z","isPatch":false,"sender":{"key":"luca.siciliano@bittwister.com","avatar":null},"body":"Hi,\ni have tried to find a solution to my problem, but i couldn't find\nanything on the documentation.\nI have created from master branch a development branch. I keep the master\nbranch regularly uptodate from the server and in the development branch i\ncommit my code. When i merge the two branches i obtain a commit with two\nparents and when i push my master branch to the server, all my development\nhistory it is also saved in the server.\nCan i avoid saving my develoment history, at least on the server, so that\nthe master branch has only one parent commits?\nThanks\n\nLuca Siciliano\n"},{"id":"97483","messageId":"adf1fd3d0812100443v23c539d6q66049af911c90d49@mail.gmail.com","threadId":"16663","inReplyTo":"50628.127.0.0.1.1228907607.squirrel@localhost","subject":"Re: Unneeded branch history","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2008-12-10T12:43:09Z","receivedAt":"2008-12-10T12:43:09Z","isPatch":false,"sender":{"key":"santi@agolina.net","avatar":null},"body":"2008/12/10 Luca Siciliano Viglieri <Luca.Siciliano@bittwister.com>:\n> Hi,\n> i have tried to find a solution to my problem, but i couldn't find\n> anything on the documentation.\n> I have created from master branch a development branch. I keep the master\n> branch regularly uptodate from the server and in the development branch i\n> commit my code. When i merge the two branches i obtain a commit with two\n> parents and when i push my master branch to the server, all my development\n> history it is also saved in the server.\n> Can i avoid saving my develoment history, at least on the server, so that\n> the master branch has only one parent commits?\n\n$ git merge --squash\n\nor\n\n$ git rebase -i master\n\nand squash/edit/... some of the revisions (this way you can have the\ninteresting development history)\n\nHTH,\nSanti\n"}]}