Re: [PATCH 2] renaming git add -i [r]evert -> reset and adding gitt add -i [c]heckout

From: Jeff King <peff@peff.net>
Date: Oct 5, 2008, 22:11 UTC
Message-ID: <20081005221150.GA22007@coredump.intra.peff.net>
In-Reply-To: <20081005214644.GB32727@gmx.de>

On Sun, Oct 05, 2008 at 11:46:44PM +0200, Marc Weber wrote:

> I'll try to do it better now (not sure who is the mantainer though,
> I've seen that you've commited some lines to this file)..

The usual git maintainer is Junio Hamano <gitster@pobox.com>.

But he is out of touch for a few weeks, so the interim maintainer is Shawn Pearce <spearce@spearce.org>.

> ============= attachement git show output ============================

The usual way of mailing patches is a bit different:

 - send one patch per email; if multiple patches are meant to be applied
   in series, number them [PATCH i/n]. In this case, I think you would
   want your patches applied in series (since the second one will
   textually depend on the first).

 - use "git format-patch" to generate the patches. This generates an
   email format that can be applied on the other end by "git am".

 - use "git send-email" to send the patches generated by format-patch.
   You can also send the patches directly from your mail reader, but you
   will want to merge your regular mail headers with those generated by
   format-patch (e.g., the Subject line generated by format-patch should
   become the subject line of your message).

Show 6 quoted lines

> commit 852b21bf88b1de784244a6e99de9a53a5c61dd8c
> Author: Marc Weber <marco-oweber@gmx.de>
> Date:   Sun Oct 5 23:09:04 2008 +0200
> 
>     rename the git add -i [r]evert command to [r]eset to use the same term as in git reset
>     purpose: decrease possibility of confusion for users with svn background (svn revert = git checkout)

Please follow the usual "subject\n\nbody" convention for commit messages. And if the patch touches just one subsystem, we usually say "subsystem: what the patch does." So something like:

  add--interactive: rename [r]evert command to [r]eset

followed by a newline, then your explanation.

I think you may want to note on this patch, too, that "revert" is also confusing for git users. Maybe like:

  The term "revert" is used very confusingly here. In git, to "revert"
  is to take the changes made by a previous commit and un-apply them,
  creating a new commit. The act of changing what is in the index to
  match HEAD is called "reset".

  Furthermore, incoming svn users will also find this confusing, since
  to them, "revert" means to reset the working tree, which corresponds
  to "checkout" in git.

Show 5 quoted lines

> commit b3d438764a7429e1dfacef8f499a0126076ed2bc
> Author: Marc Weber <marco-oweber@gmx.de>
> Date:   Sun Oct 5 15:15:38 2008 +0000
> 
>     renamed revert in ga -i to reset, added [c]heckout

The first patch has been split out, and then this one contains the changes for both. So I think what you want to do is to rebase this change on top of the previous one, so that it should then have just the "checkout" changes, and then write an appropriate commit message for it.

-Peff