| commit | 4eb56b56e7cb35ec1ff152f3b6e6c4533d48cbdd | |
| author | brian m. carlson <sandals@crustytoothpaste.net> | |
| Sun, 10 Jan 2021 19:04:48 +0000 (10 19:04 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Jan 2021 20:14:07 +0000 (11 12:14 -0800) | ||
| tree | 11ba87053b749e75e8e105fb720b430f24041ec5 | treesnapshot (tar.gz zip) |
| parent | 71ca53e8125e36efbda17293c50027d31681a41f | commitdiff |
docs: rephrase and clarify the git status --short format
The table describing the porcelain format in git-status(1) is helpful,
but it's not completely clear what the three sections mean, even to
some contributors. As a result, users are unable to find how to detect
common cases like merge conflicts programmatically.
Let's improve this situation by rephrasing to be more explicit about
what each of the sections in the table means, to tell users in plain
language which cases are occurring, and to describe what "unmerged"
means.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The table describing the porcelain format in git-status(1) is helpful,
but it's not completely clear what the three sections mean, even to
some contributors. As a result, users are unable to find how to detect
common cases like merge conflicts programmatically.
Let's improve this situation by rephrasing to be more explicit about
what each of the sections in the table means, to tell users in plain
language which cases are occurring, and to describe what "unmerged"
means.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-status.txt | diffblobblamehistory |