summaryrefslogtreecommitdiff
path: root/Documentation/config/notes.txt
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2021-01-10 19:04:48 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-11 12:14:07 -0800
commit4eb56b56e7cb35ec1ff152f3b6e6c4533d48cbdd (patch)
tree11ba87053b749e75e8e105fb720b430f24041ec5 /Documentation/config/notes.txt
parentGit 2.30 (diff)
downloadtgif-4eb56b56e7cb35ec1ff152f3b6e6c4533d48cbdd.tar.xz
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>
Diffstat (limited to 'Documentation/config/notes.txt')
0 files changed, 0 insertions, 0 deletions