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

Rewriting history and public-private-ish branches

From
JLJay Levitt <jay.levitt@gmail.com>
Date
Dec 20, 2011, 12:33 UTC
Message-ID
<4EF08086.6080606@gmail.com>

I frequently conflate git-as-version-control with git-as-deployer when I'm editing on my Mac but testing on a server. I'll do things like...

Mac: checkout -b origin/topic-branch
Mac: make a major change, commit and push
server: pull
[do while buggy]
   server: discover a typo
   Mac: fix the typo, commit and push
   server: pull
[end]
Mac: squash commits
Mac: checkout master
Mac: merge topic-branch
Mac: branch -d topic-branch
Mac: push origin :topic-branch

As long as I'm the only one who's seen this "published" history, am I doing anything bad? Do I leave any residue behind in the repo?

Jay Levitt
Next: Peter Krefting
Message 1 of 2 in “Rewriting history and public-private-ish branches”
  1. Jay LevittDec 20, 2011
  2. Peter KreftingDec 21, 2011

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.