From 68dd3109fceffe618292561626a01d67b42f6055 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Tue, 3 Apr 2012 22:16:40 -0400
Subject: [PATCH] Move Git zstyles into the git-info header comment

---
 modules/git/functions/git-info | 60 +++++++++++++++++++++++++++++++
 modules/git/init.zsh           |  1 -
 modules/git/style.zsh          | 64 ----------------------------------
 3 files changed, 60 insertions(+), 65 deletions(-)
 delete mode 100644 modules/git/style.zsh

diff --git a/modules/git/functions/git-info b/modules/git/functions/git-info
index 5337a3e4..0045bf20 100644
--- a/modules/git/functions/git-info
+++ b/modules/git/functions/git-info
@@ -4,6 +4,66 @@
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
+# Usage:
+#   Define the following styles in a prompt theme setup function.
+#
+#     # %s - Special action name (am, merge, rebase).
+#     zstyle ':omz:module:git' action 'action:%s'
+#
+#     # %a - Indicator to notify of added files.
+#     zstyle ':omz:module:git' added 'added:%a'
+#
+#     # %A - Indicator to notify of ahead branch.
+#     zstyle ':omz:module:git' ahead 'ahead:%A'
+#
+#     # %B - Indicator to notify of behind branch.
+#     zstyle ':omz:module:git' behind 'behind:%B'
+#
+#     # %b - Branch name.
+#     zstyle ':omz:module:git' branch 'branch:%b'
+#
+#     # %c - SHA-1 hash.
+#     zstyle ':omz:module:git' commit 'commit:%c'
+#
+#     # %d - Indicator to notify of deleted files.
+#     zstyle ':omz:module:git' deleted 'deleted:%d'
+#
+#     # %D - Indicator to notify of dirty files.
+#     zstyle ':omz:module:git' dirty 'dirty:%D'
+#
+#     # %m - Indicator to notify of modified files.
+#     zstyle ':omz:module:git' modified 'modified:%m'
+#
+#     # %p - HEAD position in relation to the nearest branch, remote, tag.
+#     zstyle ':omz:module:git:prompt' position 'position:%p'
+#
+#     # %R - Remote name.
+#     zstyle ':omz:moduleit' remote 'remote:%R'
+#
+#     # %r - Indicator to notify of renamed files.
+#     zstyle ':omz:module:git' renamed 'renamed:%r'
+#
+#     # %S - Indicator to notify of stashed files.
+#     zstyle ':omz:module:git' stashed 'stashed:%S'
+#
+#     # %U - Indicator tnotify of unmerged files.
+#     zstyle ':omz:module:git' unmerged 'unmerged:%U'
+#
+#     # %u - Indicator to notify of untracked files.
+#     zstyle ':omz:module:git' untracked 'untracked:%u'
+#
+#     # Left prompt.
+#     zstyle ':omz:module:git' prompt ' git:(%b %D)'
+#
+#     # Right prompt.
+#     zstyle ':omz:module:git' rprompt ''
+#
+#     # Ignore submodule.
+#     zstyle ':omz:module:git:ignore' submodule 'no'
+#
+#     # Ignore submodule when it is 'dirty', 'untracked', 'all', or 'none'.
+#     zstyle ':omz:module:git:ignore:submodule' when 'all'
+#
 
 # Gets the path to the Git directory.
 function _git-dir {
diff --git a/modules/git/init.zsh b/modules/git/init.zsh
index 819422f2..e3c3ac84 100644
--- a/modules/git/init.zsh
+++ b/modules/git/init.zsh
@@ -8,5 +8,4 @@
 # Source module files.
 source "${0:h}/alias.zsh"
 source "${0:h}/hub.zsh"
-source "${0:h}/style.zsh"
 
diff --git a/modules/git/style.zsh b/modules/git/style.zsh
deleted file mode 100644
index f5debdcc..00000000
--- a/modules/git/style.zsh
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Defines Git information display styles.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-# %s - Special action name (am, merge, rebase).
-zstyle ':omz:module:git' action 'action:%s'
-
-# %a - Indicator to notify of added files.
-zstyle ':omz:module:git' added 'added:%a'
-
-# %A - Indicator to notify of ahead branch.
-zstyle ':omz:module:git' ahead 'ahead:%A'
-
-# %B - Indicator to notify of behind branch.
-zstyle ':omz:module:git' behind 'behind:%B'
-
-# %b - Branch name.
-zstyle ':omz:module:git' branch 'branch:%b'
-
-# %c - SHA-1 hash.
-zstyle ':omz:module:git' commit 'commit:%c'
-
-# %d - Indicator to notify of deleted files.
-zstyle ':omz:module:git' deleted 'deleted:%d'
-
-# %D - Indicator to notify of dirty files.
-zstyle ':omz:module:git' dirty 'dirty:%D'
-
-# %m - Indicator to notify of modified files.
-zstyle ':omz:module:git' modified 'modified:%m'
-
-# %p - HEAD position in relation to the nearest branch, remote, tag.
-zstyle ':omz:module:git:prompt' position 'position:%p'
-
-# %R - Remote name.
-zstyle ':omz:module:git' remote 'remote:%R'
-
-# %r - Indicator to notify of renamed files.
-zstyle ':omz:module:git' renamed 'renamed:%r'
-
-# %S - Indicator to notify of stashed files.
-zstyle ':omz:module:git' stashed 'stashed:%S'
-
-# %U - Indicator to notify of unmerged files.
-zstyle ':omz:module:git' unmerged 'unmerged:%U'
-
-# %u - Indicator to notify of untracked files.
-zstyle ':omz:module:git' untracked 'untracked:%u'
-
-# Left prompt.
-zstyle ':omz:module:git' prompt ' git:(%b %D)'
-
-# Right prompt.
-zstyle ':omz:module:git' rprompt ''
-
-# Ignore submodule.
-zstyle ':omz:module:git:ignore' submodule 'no'
-
-# Ignore submodule when it is 'dirty', 'untracked', 'all', or 'none'.
-zstyle ':omz:module:git:ignore:submodule' when 'all'
-