From 590e5df50fe7a596017887ef432c41622e8abc3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mariusz=20Smyku=C5=82a?= <mariuszs@gmail.com>
Date: Sun, 2 Jun 2013 13:10:40 +0200
Subject: [PATCH] Fix previous commit

---
 git.nanorc | 78 ++++++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

diff --git a/git.nanorc b/git.nanorc
index 179fcfc..9ab2b35 100644
--- a/git.nanorc
+++ b/git.nanorc
@@ -1,3 +1,13 @@
+syntax "gitconfig" "git(config|modules)$|\.git/config$"
+
+color brightcyan "\<(true|false)\>"
+color cyan "^[[:space:]]*[^=]*="
+color brightmagenta "^[[:space:]]*\[.*\]$"
+color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color brightblack "(^|[[:space:]])#([^{].*)?$"
+color ,green "[[:space:]]+$"
+color ,red "	+"
+
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
@@ -6,17 +16,10 @@
 # A nano configuration file to enable syntax highlighting of some Git specific
 # files with the GNU nano text editor (http://www.nano-editor.org)
 #
-# Save this file to a directory of your choice and add it to your nanorc using
-# include ${PATH_TO_THE_FILE}/git.nanorc
-
-# This syntax format is used for editing commit and tag messages
 syntax "git commit/tag messages" "COMMIT_EDITMSG|TAG_EDITMSG"
 
 # Commit message
-color white ".*"
-
-# Subject line (This is pretty weird, but it works at least for OS X' nano 2.0.6)
-#    color brightcyan start="^" end="$"
+color yellow ".*"
 
 # Comments
 color brightblack "^#.*"
@@ -29,54 +32,49 @@ color brightgreen "#[[:space:]]new file:"
 color brightblue  "#[[:space:]]renamed:"
 
 # Untracked filenames
-color blue "^#	[^/?*:;{}\\]+$"
+color black "^#	[^/?*:;{}\\]+\.[^/?*:;{}\\]+$"
+
+color brightmagenta "^#[[:space:]]Changes.*[:]"
+color brightred "^#[[:space:]]Your branch and '[^']+"
+color brightblack "^#[[:space:]]Your branch and '"
+color brightwhite "^#[[:space:]]On branch [^ ]+"
+color brightblack "^#[[:space:]]On branch"
+
+# Recolor hash symbols
 
 # Recolor hash symbols
 color brightblack "#"
 
-color magenta "#[[:space:]]Changes to be committed:"
-
-# Trailing spaces
+# Trailing spaces (+LINT is not ok, git uses tabs)
 color ,red "[[:space:]]+$"
 
+
 # This syntax format is used for interactive rebasing
 syntax "git rebase todo" "git-rebase-todo"
 
 # Default
-color white ".*"
+color yellow ".*"
 
 # Comments
-color brightblack   "^#.*"
-color brightred     "^noop$"
+color brightblack "^#.*"
 
 # Rebase commands
-color green         "^(e|edit) [0-9a-f]{7,40}"
-color green         "^#  (e, edit)"
-color brightgreen   "^(f|fixup) [0-9a-f]{7,40}"
-color brightgreen   "^#  (f, fixup)"
-color brightmagenta "^(p|pick) [0-9a-f]{7,40}"
-color brightmagenta "^#  (p, pick)"
-color blue          "^(r|reword) [0-9a-f]{7,40}"
-color blue          "^#  (r, reword)"
-color brightcyan    "^(s|squash) [0-9a-f]{7,40}"
-color brightcyan    "^#  (s, squash)"
-color yellow        "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
-color yellow        "^#  (x, exec)"
+color green       "^(e|edit) [0-9a-f]{7,40}"
+color green       "^#  (e, edit)"
+color brightgreen "^(f|fixup) [0-9a-f]{7,40}"
+color brightgreen "^#  (f, fixup)"
+color brightwhite "^(p|pick) [0-9a-f]{7,40}"
+color brightwhite "^#  (p, pick)"
+color blue        "^(r|reword) [0-9a-f]{7,40}"
+color blue        "^#  (r, reword)"
+color brightred   "^(s|squash) [0-9a-f]{7,40}"
+color brightred   "^#  (s, squash)"
+color yellow      "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
+color yellow      "^#  (x, exec)"
 
 # Recolor hash symbols
-color brightblack   "#"
+color brightblack "#"
 
 # Commit IDs
-color white "[0-9a-f]{7,40}"
-
-# Derived from https://github.com/craigbarnes/nanorc
-syntax "gitconfig" "git(config|modules)$|\.git/config$"
-
-color brightcyan "\<(true|false)\>"
-color cyan "^[[:space:]]*[^=]*="
-color brightmagenta "^[[:space:]]*\[.*\]$"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "    +"
+color brightblue "[0-9a-f]{7,40}"