Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: git@vger.kernel.org,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Stephan Beyer <s-beyer@gmx.net>,
	Daniel Barkalow <barkalow@iabervon.org>,
	Jakub Narebski <jnareb@gmail.com>,
	Paolo Bonzini <bonzini@gnu.org>,
	Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCH v4 0/6] "git reset --merge" related improvements
Date: Tue, 08 Dec 2009 00:29:43 -0800	[thread overview]
Message-ID: <7vk4wxkgw8.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20091208075005.4475.26582.chriscool@tuxfamily.org> (Christian Couder's message of "Tue\, 08 Dec 2009 08\:56\:09 +0100")

Christian Couder <chriscool@tuxfamily.org> writes:

> The new option name is "--keep-local-changes" because that's what
> Junio used in the last email of the previous discussion, but my
> opinion is that it is a bit long and so I'd like to rename it "--keep"
> or another such short name.

I vaguely recall that I mentioned something like "I still don't know what
you are going to use this for, even though I think I am starting to
understand it a bit better than before. In any case, it sounds like 'keep
local changes' rather than 'safe'".

Please don't take that as a serious suggestion of a better name.

IOW, don't mind me---come up with a name that describes what you
are doing better.  But please don't blame me either ;-)

      parent reply	other threads:[~2009-12-08  8:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-08  7:56 [PATCH v4 0/6] "git reset --merge" related improvements Christian Couder
2009-12-08  7:56 ` [PATCH v4 1/6] reset: add a few tests for "git reset --merge" Christian Couder
2009-12-08  7:56 ` [PATCH v4 2/6] reset: use "unpack_trees()" directly instead of "git read-tree" Christian Couder
2009-12-08  8:45   ` Stephen Boyd
2009-12-12  4:19     ` Christian Couder
2009-12-08  7:56 ` [PATCH v4 3/6] reset: add option "--keep-local-changes" to "git reset" Christian Couder
2009-12-08  7:56 ` [PATCH v4 4/6] reset: add test cases for "--keep-local-changes" option Christian Couder
2009-12-08  7:56 ` [PATCH v4 5/6] Documentation: reset: describe new " Christian Couder
2009-12-08  7:56 ` [PATCH v4 6/6] Documentation: reset: add some tables to describe the different options Christian Couder
2009-12-08  8:29 ` Junio C Hamano [this message]

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=7vk4wxkgw8.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=barkalow@iabervon.org \
    --cc=bonzini@gnu.org \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=j.sixt@viscovery.net \
    --cc=jnareb@gmail.com \
    --cc=s-beyer@gmx.net \
    --cc=torvalds@linux-foundation.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