From: Daniel Barkalow <barkalow@iabervon.org>
To: Christian Couder <christian.couder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>,
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 v3 3/4] reset: add option "--merge-safe" to "git reset"
Date: Thu, 17 Sep 2009 17:04:42 -0400 (EDT) [thread overview]
Message-ID: <alpine.LNX.2.00.0909171654500.14907@iabervon.org> (raw)
In-Reply-To: <c07716ae0909170525h21ab26f5y84b0fbce2192c69@mail.gmail.com>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 914 bytes --]
On Thu, 17 Sep 2009, Christian Couder wrote:
> On Thu, Sep 17, 2009 at 7:15 AM, Junio C Hamano <gitster@pobox.com> wrote:
>
> > I'd like to see at least the following rows filled as well.
> >
> > X U A A --m-s ??? ??? ???
> > --merge ??? ??? ???
> > X U B A --m-s ??? ??? ???
> > --merge ??? ??? ???
> >
> >> In this table, A, B and C are some different states of a file.
> >
> > ... and X is "don't care", and U is "unmerged index".
>
> I will have a look, but it seems to me that --m-s and --merge
> behave the same in these cases.
It's still worth documenting, since it used to be entirely undocumented
(and probably not what it should have been), and also because you're
making it something reliable for the first time in this series.
-Daniel
*This .sig left intentionally blank*
next prev parent reply other threads:[~2009-09-17 21:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-17 4:14 [PATCH v3 0/4] "git reset --merge" related improvements Christian Couder
2009-09-17 4:14 ` [PATCH v3 1/4] reset: add a few tests for "git reset --merge" Christian Couder
2009-09-17 4:14 ` [PATCH v3 2/4] reset: use "unpack_trees()" directly instead of "git read-tree" Christian Couder
2009-09-17 4:14 ` [PATCH v3 3/4] reset: add option "--merge-safe" to "git reset" Christian Couder
2009-09-17 5:15 ` Junio C Hamano
2009-09-17 6:38 ` Johannes Sixt
2009-09-17 7:07 ` Junio C Hamano
2009-09-17 7:24 ` Johannes Sixt
2009-09-17 12:12 ` Christian Couder
2009-09-17 13:05 ` Johannes Sixt
2009-09-17 13:25 ` Christian Couder
2009-09-17 20:43 ` Junio C Hamano
2009-09-17 12:25 ` Christian Couder
2009-09-17 21:04 ` Daniel Barkalow [this message]
2009-09-17 4:14 ` [PATCH v3 4/4] reset: add test cases for "--merge-safe" option Christian Couder
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LNX.2.00.0909171654500.14907@iabervon.org \
--to=barkalow@iabervon.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.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).