{"thread":{"id":"38773","subject":"Missing slot \"unmerged\"","startedAt":"2015-03-10T12:44:03Z","lastAt":"2015-03-10T16:11:09Z","messageCount":2,"participants":["Mladen B.","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"257465","messageId":"CAKHLQpFPJS2rp-QswBSmO72yx253LZC-LTZCimk+f+un0tAWZg@mail.gmail.com","threadId":"38773","inReplyTo":null,"subject":"Missing slot \"unmerged\"","fromName":"Mladen B.","fromEmail":"mladen074@gmail.com","sentAt":"2015-03-10T12:44:03Z","receivedAt":"2015-03-10T12:44:03Z","isPatch":false,"sender":{"key":"mladen074@gmail.com","avatar":null},"body":"Hi,\n\nI noticed there is a missing <slot> named \"unmerged\" inside the\n\"color.status.<slot>\" on the documentation page:\nhttp://git-scm.com/docs/git-config\n\nThis color is used when \"git status\" command is performed during the\nconflict in the rebase process.\n\nM.\n"},{"id":"257476","messageId":"1e27ed382c4dc09ee5993b828c16b89e34d1cdf4.1426003811.git.git@drmicha.warpmail.net","threadId":"38773","inReplyTo":"CAKHLQpFPJS2rp-QswBSmO72yx253LZC-LTZCimk+f+un0tAWZg@mail.gmail.com","subject":"[PATCH] config,completion: add color.status.unmerged","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-03-10T16:11:09Z","receivedAt":"2015-03-10T16:11:09Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Reported-by: \"Mladen B.\" <mladen074@gmail.com>\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\n Documentation/config.txt               | 6 ++++--\n contrib/completion/git-completion.bash | 1 +\n 2 files changed, 5 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex a158e7f..bc22eee 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -958,9 +958,11 @@ color.status.<slot>::\n \t`added` or `updated` (files which are added but not committed),\n \t`changed` (files which are changed but not added in the index),\n \t`untracked` (files which are not tracked by Git),\n-\t`branch` (the current branch), or\n+\t`branch` (the current branch),\n \t`nobranch` (the color the 'no branch' warning is shown in, defaulting\n-\tto red). The values of these variables may be specified as in\n+\tto red), or\n+\t`unmerged` (files which have unmerged changes).\n+\tThe values of these variables may be specified as in\n \tcolor.branch.<slot>.\n \n color.ui::\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex c21190d..e310f31 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -2014,6 +2014,7 @@ _git_config ()\n \t\tcolor.status.changed\n \t\tcolor.status.header\n \t\tcolor.status.nobranch\n+\t\tcolor.status.unmerged\n \t\tcolor.status.untracked\n \t\tcolor.status.updated\n \t\tcolor.ui\n-- \n2.3.2.346.gb6960c9\n"}]}