git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Packham <judge.packham@gmail.com>
To: GIT <git@vger.kernel.org>
Cc: bkorb@gnu.org, Jakub Narebski <jnareb@gmail.com>, schacon@gmail.com
Subject: Re: failed to push
Date: Tue, 2 Mar 2010 13:36:47 -0800	[thread overview]
Message-ID: <a038bef51003021336g3ab0b4f6vba2738a18a92dd36@mail.gmail.com> (raw)
In-Reply-To: <m3tysylexh.fsf@localhost.localdomain>

On Tue, Mar 2, 2010 at 11:09 AM, Jakub Narebski <jnareb@gmail.com> wrote:

> Well, all of us old gitters know: 1) that you should not change
> published (pushed) history, 2) that commits are immutable, and 3) that
> amending a commit generates new commit with correction and therefore
> changes history.
>
> It is true that git documentation ("Git User's Manual", "Git Community
> Book", "Pro Git") can be lacking... unfortunately by the time somebody
> is knowledgeable enough to write git documentaions, he/she is usally
> used to git way of doing things, and the documentation might not be
> newbie-friendly.

I thought I smelt an easy documentation patch but the current help for
git commit --amend seems to cover it

"You should understand the implications of rewriting history if you
amend a commit that has already been published"

These sections [1],[2] of the git community book could probably do
with a note on the consequences or re-writing history. I'll see if I
can figure out how to submit a change.

[1] http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html
[2] http://book.git-scm.com/5_modifying_your_history.html

>Bruce Korb <bkorb@gnu.org> writes:
>> Then please be kind enough to put a *CAUTION* button next to
>> the amend button and have it bring up something that gives you
>> a little warning.  GIT *could* have been written in a way that
>> causes the remote repo to become synced with my local repo,
>> but apparently it was not and there was not adequate warning.

Shouldn't be too hard to repeat the warning from git help commit. Just
not sure of what the least intrusive way to do it is (plus my tcl-fu
is weak).

  reply	other threads:[~2010-03-02 21:36 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-01 21:15 failed to push Bruce Korb
2010-03-01 21:23 ` Bruce Korb
2010-03-01 21:42   ` Chris Packham
2010-03-01 22:00     ` Bruce Korb
2010-03-01 22:04       ` SUCCESS -- " Bruce Korb
2010-03-02 11:44       ` Erik Faye-Lund
2010-03-02 19:09       ` Jakub Narebski
2010-03-02 21:36         ` Chris Packham [this message]
2010-03-02 23:07           ` [gitbook PATCH] add notes on re-writing history Chris Packham
2010-03-01 21:27 ` failed to push Jacob Helwig

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=a038bef51003021336g3ab0b4f6vba2738a18a92dd36@mail.gmail.com \
    --to=judge.packham@gmail.com \
    --cc=bkorb@gnu.org \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    --cc=schacon@gmail.com \
    /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).