Re: Suggestions to make git easier to understand
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Aug 11, 2011, 23:08 UTC
- Message-ID
- <20110811230807.GA5608@elie.gateway.2wire.net>
- 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