From: Jay Levitt <jay.levitt@gmail.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Rewriting history and public-private-ish branches
Date: Tue, 20 Dec 2011 07:33:10 -0500 [thread overview]
Message-ID: <4EF08086.6080606@gmail.com> (raw)
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 reply other threads:[~2011-12-20 12:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-20 12:33 Jay Levitt [this message]
2011-12-21 12:58 ` Rewriting history and public-private-ish branches Peter Krefting
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=4EF08086.6080606@gmail.com \
--to=jay.levitt@gmail.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).