From: Junio C Hamano <gitster@pobox.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
David Abrahams <dave@boostpro.com>,
git@vger.kernel.org
Subject: Re: friendlier names
Date: Tue, 27 Jan 2009 20:51:25 -0800 [thread overview]
Message-ID: <7vwscgvxrm.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200901280312.16717.jnareb@gmail.com> (Jakub Narebski's message of "Wed, 28 Jan 2009 03:12:16 +0100")
Jakub Narebski <jnareb@gmail.com> writes:
> BTW with "git add" way you have to know that "git add"-ing a file
> would clear 'is in merge conflict' flags (well, will hide >0 stages...).
Sigh...
Again, you seem to be affected by the same confusion that caused you to
think "git resolved" may have some reason to exist.
An unmerged index with higer stages means that the contents that need to
be in the next commit is _unknown_ for the paths.
If somebody says "I am telling you that this path has the contents I want
to have in the commit I will create next" (which is what "staging" the
contents in the "index" is), what plausible reason does git have to keep
the higher stages for them? At that point, the contents the user wants to
have for these paths are known.
prev parent reply other threads:[~2009-01-28 4:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-27 15:30 friendlier names David Abrahams
2009-01-27 15:33 ` Felipe Contreras
2009-01-27 15:38 ` Shawn O. Pearce
2009-01-27 16:40 ` David Abrahams
2009-01-27 18:10 ` Johannes Schindelin
2009-01-27 18:28 ` Junio C Hamano
2009-01-27 19:17 ` Jakub Narebski
2009-01-27 19:50 ` Junio C Hamano
2009-01-28 2:12 ` Jakub Narebski
2009-01-28 4:51 ` 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=7vwscgvxrm.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=dave@boostpro.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=spearce@spearce.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;
as well as URLs for NNTP newsgroup(s).