From: Paolo Bonzini <bonzini@gnu.org>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: Daniel Barkalow <barkalow@iabervon.org>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Jakub Narebski <jnareb@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH 4/4] reset: add test cases for "--merge-dirty" option
Date: Mon, 14 Sep 2009 00:15:01 +0200 [thread overview]
Message-ID: <4AAD6EE5.20508@gnu.org> (raw)
In-Reply-To: <200909110705.35083.chriscool@tuxfamily.org>
> If they get merged, the option name '--merge-dirty" will probably be changed
> to something else like "--merge-safe" so I will have to change some patches
> anyway.
--merge-index or --merge-staged?
Also, it would be great if you would prepare tables like these for all
cases of git-reset.
Paolo
prev parent reply other threads:[~2009-09-13 22:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-10 20:23 [PATCH 0/4] "git reset --merge" related improvements Christian Couder
2009-09-10 20:23 ` [PATCH 1/4] reset: add a few tests for "git reset --merge" Christian Couder
2009-09-10 20:59 ` Jakub Narebski
2009-09-11 5:22 ` Christian Couder
2009-09-13 22:01 ` Tony Finch
2009-09-10 20:23 ` [PATCH 2/4] reset: use "unpack_trees()" directly instead of "git read-tree" Christian Couder
2009-09-11 5:20 ` Junio C Hamano
2009-09-11 5:34 ` Christian Couder
2009-09-11 5:55 ` Junio C Hamano
2009-09-11 6:32 ` Daniel Barkalow
2009-09-10 20:23 ` [PATCH 3/4] reset: add option "--merge-dirty" to "git reset" Christian Couder
2009-09-10 23:24 ` Linus Torvalds
2009-09-11 5:29 ` Christian Couder
2009-09-11 16:02 ` Linus Torvalds
2009-09-11 5:34 ` Junio C Hamano
2009-09-10 20:23 ` [PATCH 4/4] reset: add test cases for "--merge-dirty" option Christian Couder
2009-09-10 22:14 ` Daniel Barkalow
2009-09-11 5:05 ` Christian Couder
2009-09-11 5:36 ` Daniel Barkalow
2009-09-15 4:32 ` Christian Couder
2009-09-13 22:15 ` Paolo Bonzini [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=4AAD6EE5.20508@gnu.org \
--to=bonzini@gnu.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.