From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Philippe Vaucher" <philippe.vaucher@gmail.com>,
git@vger.kernel.org, "Rafael Magana" <raf.magana@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: Suggestions to make git easier to understand
Date: Thu, 11 Aug 2011 18:08:08 -0500 [thread overview]
Message-ID: <20110811230807.GA5608@elie.gateway.2wire.net> (raw)
In-Reply-To: <7vmxffpo8e.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> I do not think "ls-files --contents" makes things any better, though.
> Until a new user encounters a conflicted state, it might look like that
> the primary point of "ls-files -s" is to show the object names, but it
> also is important that it shows the stage numbers.
Yes, sloppy of me. I should have said "the intent of these
suggestions seems reasonable, and I believe that with minimal tweaking
they would all lead to good things".
In the case of "ls-files -s", I suspect what would be most useful is
a new porcelain "git ls --merge", building on Duy's work[*].
[*] http://thread.gmane.org/gmane.comp.version-control.git/166405/focus=166415
next prev parent reply other threads:[~2011-08-11 23:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-11 7:48 Suggestions to make git easier to understand Philippe Vaucher
2011-08-11 22:16 ` Jonathan Nieder
2011-08-11 22:39 ` Junio C Hamano
2011-08-11 23:08 ` Jonathan Nieder [this message]
2011-08-12 22:26 ` Jeff King
2011-08-15 10:15 ` Philippe Vaucher
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=20110811230807.GA5608@elie.gateway.2wire.net \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=philippe.vaucher@gmail.com \
--cc=raf.magana@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).