git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Unneeded branch history

From
SBSanti Béjar <santi@agolina.net>
Date
Dec 10, 2008, 12:43 UTC
Message-ID
<adf1fd3d0812100443v23c539d6q66049af911c90d49@mail.gmail.com>
In-Reply-To
<50628.127.0.0.1.1228907607.squirrel@localhost>
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

Previous: Luca Siciliano Viglieri
Message 2 of 2 in “Unneeded branch history”
  1. Luca Siciliano ViglieriDec 10, 2008
  2. Santi BéjarDec 10, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.