From: "Santi Béjar" <santi@agolina.net>
To: "Luca Siciliano Viglieri" <Luca.Siciliano@bittwister.com>
Cc: git@vger.kernel.org
Subject: Re: Unneeded branch history
Date: Wed, 10 Dec 2008 13:43:09 +0100 [thread overview]
Message-ID: <adf1fd3d0812100443v23c539d6q66049af911c90d49@mail.gmail.com> (raw)
In-Reply-To: <50628.127.0.0.1.1228907607.squirrel@localhost>
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
prev parent reply other threads:[~2008-12-10 12:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-10 11:13 Unneeded branch history Luca Siciliano Viglieri
2008-12-10 12:43 ` Santi Béjar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=adf1fd3d0812100443v23c539d6q66049af911c90d49@mail.gmail.com \
--to=santi@agolina.net \
--cc=Luca.Siciliano@bittwister.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).