git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Howard Miller <howard@e-learndesign.co.uk>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Alexey Feldgendler <alexeyf@opera.com>, git@vger.kernel.org
Subject: Re: Correcting forgetting to make a new branch
Date: Fri, 11 Mar 2011 15:53:19 +0000	[thread overview]
Message-ID: <AANLkTikjonZxcHk3a4HvEhiDfcBqwgpqzFP2F=8tF7qv@mail.gmail.com> (raw)
In-Reply-To: <vpqk4g57j1h.fsf@bauges.imag.fr>

> "Alexey Feldgendler" <alexeyf@opera.com> writes:
>
>> However, the branch that was active before when you should have
>> branched will have been unintentionally updated. To fix that, you'll
>> need to move the old branch a few commits back:
>>
>> git branch -f <old-branch> <where-it-was-before>
>
> This is correct, but for completeness: don't do that if you've already
> pushed your changes. If you pushed them and people already pulled them,
> you can hardly do better than appologize to your co-workers that you
> shouldn't have done that, and possibly create a new commit on top of the
> branch reverting what you did.

I hadn't (luckily), so that worked fine. Thanks for your help - both of you :)

  reply	other threads:[~2011-03-11 15:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-11 15:31 Correcting forgetting to make a new branch Howard Miller
2011-03-11 15:46 ` Alexey Feldgendler
2011-03-11 15:50   ` Matthieu Moy
2011-03-11 15:53     ` Howard Miller [this message]
2011-03-11 15:49 ` Michael J Gruber

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='AANLkTikjonZxcHk3a4HvEhiDfcBqwgpqzFP2F=8tF7qv@mail.gmail.com' \
    --to=howard@e-learndesign.co.uk \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=alexeyf@opera.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).