* Unneeded branch history
@ 2008-12-10 11:13 Luca Siciliano Viglieri
2008-12-10 12:43 ` Santi Béjar
0 siblings, 1 reply; 2+ messages in thread
From: Luca Siciliano Viglieri @ 2008-12-10 11:13 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Unneeded branch history
2008-12-10 11:13 Unneeded branch history Luca Siciliano Viglieri
@ 2008-12-10 12:43 ` Santi Béjar
0 siblings, 0 replies; 2+ messages in thread
From: Santi Béjar @ 2008-12-10 12:43 UTC (permalink / raw)
To: Luca Siciliano Viglieri; +Cc: git
2008/12/10 Luca Siciliano Viglieri <Luca.Siciliano@bittwister.com>:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-12-10 12:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-10 11:13 Unneeded branch history Luca Siciliano Viglieri
2008-12-10 12:43 ` Santi Béjar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).