From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Alan Mackenzie <acm@muc.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] docs: add description of status output table
Date: Sun, 10 Jan 2021 18:32:58 +0000 [thread overview]
Message-ID: <X/tIWgzANq7e71X7@camp.crustytoothpaste.net> (raw)
In-Reply-To: <X/ry+ApdWMFs5l/+@ACM>
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
On 2021-01-10 at 12:28:40, Alan Mackenzie wrote:
> On Sat, Jan 09, 2021 at 17:41:23 -0800, Junio C Hamano wrote:
> > I am actually tempted to suggest rewriting the whole section,
> > starting from the paragraph above and ending at the table, with
> > something like this:
>
> > Three different classes of paths are shown in the same format,
> > but the meaning of `XY` are different:
>
> > * For merged paths, `X` shows the status of the index, and `Y`
> > shows the status of the working tree.
>
> > * For unmerged paths, `X` and `Y` show the modification states
> > of each side of the merge, relative to the common ancestor.
>
> Also missing from the current doc, I think, is a description of which
> "side" of the difference is represented by X, and which by Y. In my use
> case (having conflicts after doing a git stash pop) those "sides" would
> be the work tree and the repository. In other scenarios (say a merge
> conflict after git pull) I think they would be something else (though my
> head is hurting a bit, here).
The two sides are the two heads that are being merged and don't include
the working tree at all. I think the answer about which side is which
in a merge depends on whether you're merging or rebasing. Rebases do
things the opposite way of how merges do them.
In your case, you're interested in the fact that there _is_ an
unresolved conflict, which means you'll either get DD, AA, or something
with a U in it. That will happen regardless of how you do it, with git
pull, git merge, git rebase -m, or git cherry-pick, and it indicates
that the working tree is "broken" (i.e., has conflict markers) and the
index is in a conflicted state. Since the state of the working tree and
the index are known, we use this field for listing the two heads
instead.
--
brian m. carlson (he/him or they/them)
Houston, Texas, US
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
next prev parent reply other threads:[~2021-01-10 18:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-09 19:14 Difficulties of scripting git Alan Mackenzie
2021-01-09 21:42 ` brian m. carlson
2021-01-09 22:06 ` [PATCH] docs: add description of status output table brian m. carlson
2021-01-10 1:41 ` Junio C Hamano
2021-01-10 1:58 ` brian m. carlson
2021-01-10 12:28 ` Alan Mackenzie
2021-01-10 18:32 ` brian m. carlson [this message]
2021-01-10 19:04 ` [PATCH v2] docs: rephrase and clarify the git status --short format brian m. carlson
2021-01-11 20:22 ` Junio C Hamano
2021-01-16 21:45 ` brian m. carlson
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=X/tIWgzANq7e71X7@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=acm@muc.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).