git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Matt Pearson" <404emailnotfound@gmail.com>
To: "Robert Haines" <rhaines@manchester.ac.uk>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: Pushing an --amend-ed commit
Date: Mon, 2 Jun 2008 20:08:48 -0400	[thread overview]
Message-ID: <706b4240806021708u4ade0f9ake53e26f53e34d97d@mail.gmail.com> (raw)
In-Reply-To: <6B355924-0EA9-4AF8-B051-F17FC4530495@manchester.ac.uk>

On Mon, Jun 2, 2008 at 5:51 AM, Robert Haines <rhaines@manchester.ac.uk> wrote:
> So, is it safe to "use the --force" in this instance when pushing? This
> should just replace the old commit with the --amended commit with no
> side-effects, shouldn't it?

Safe from what perspective?  If you're sure nobody has pulled from
you, then yes, it's fine.  If you know exactly who pulled and can
contact them to do a reset and re-pull, then it should be fine. If you
don't care about screwing up people who pulled from you, then I
suppose that's still fine.  However, screwing with history is
generally a bad idea, since now people who pull from you don't have
your current HEAD as a parent commit in their tree.  Finding common
ancestors is going to be messed up (and future merges with them,
possibly).

(also, first git mailing list post.  I hope none of the experienced
people have to correct me)

  parent reply	other threads:[~2008-06-03  0:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-02  9:51 Pushing an --amend-ed commit Robert Haines
2008-06-02 14:55 ` Pushing an --amend-ed commit [and a git-merge-theirs strategy] Paolo Bonzini
2008-06-03 17:49   ` Robert Haines
2008-06-03  0:08 ` Matt Pearson [this message]
2008-06-03  0:22   ` Pushing an --amend-ed commit Matt Pearson

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=706b4240806021708u4ade0f9ake53e26f53e34d97d@mail.gmail.com \
    --to=404emailnotfound@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=rhaines@manchester.ac.uk \
    /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).