unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Ken Manheimer <ken.manheimer@gmail.com>
Cc: rgm@gnu.org, emacs-devel@gnu.org
Subject: Re: master 89898fc: Repair pdbtrack so it follows transition from one	remote file to another.
Date: Sun, 20 Sep 2015 20:06:57 +0300	[thread overview]
Message-ID: <836135ow9a.fsf@gnu.org> (raw)
In-Reply-To: <CAAT_zTEyPc1+4xmTBLzTMYqwAreQEQBFsEEgVrwaVZu6J2MKMQ@mail.gmail.com>

> From: Ken Manheimer <ken.manheimer@gmail.com>
> Date: Sun, 20 Sep 2015 11:59:46 -0400
> 
> I am clear that I should remove the ChangeLog.17 entry, and can easily do that
> with an additional, cumulative commit.
> 
> I gather my commit message for the code change should have been:
> 
>     
>     
>     Repair pdbtrack remote file tracking
>     
>     
>     * lisp/progmodes/python.el (python-pdbtrack-set-tracked-buffer): Rectify
>     pdbtrack so it follows transition from one remote file to another.
>     
> 
> I think I am able to `git amend` the original code commit, but I have very
> rarely done that, and am not sure it's the right thing, besides. So: should I
> amend 89898fc, or just do another, distinct commit?

You cannot amend a commit you've already pushed.  Also, the commit
message cannot be fixed by another commit.  What you can do is fix the
entry in ChangeLog.2 produced from that commit log, and then commit
the modified ChangeLog.2.

> Also, I have finally found the location of guidance for commit messages -
> CONTRIBUTORS in the source directory root. I had looked for guidance in
> http://www.emacswiki.org/emacs/GitForEmacsDevs - it would have be helpful if
> that prominently directed contributors to the CONTRIBUTORS file. Perhaps I'm
> just oblivious, but it seems like the various guidance resources are scattered
> enough that there is not an unmissable "garden path" to fill people in.

CONTRIBUTORS is the only reference you should read.



  reply	other threads:[~2015-09-20 17:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-20 15:59 master 89898fc: Repair pdbtrack so it follows transition from one remote file to another Ken Manheimer
2015-09-20 17:06 ` Eli Zaretskii [this message]
2015-09-20 23:01 ` Xue Fuqiao
2015-09-22  4:25   ` Ken Manheimer
     [not found] <20150920013701.15507.11501@vcs.savannah.gnu.org>
     [not found] ` <E1ZdTYr-00042q-6b@vcs.savannah.gnu.org>
2015-09-20 10:44   ` Glenn Morris
2015-09-20 11:35     ` Glenn Morris
2015-09-20 12:40       ` Eli Zaretskii

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

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=836135ow9a.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=ken.manheimer@gmail.com \
    --cc=rgm@gnu.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.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).