ac58ffdf6623dd703c341881a350d23c4fb751ba

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #1840 from yleo77/master

About gf alias

Diff

 1diff --git a/.gitignore b/.gitignore
 2index 51a5ee6c396f012ae162d0d63006d4d8e765b92f..5db11ce5cbbbb028365b0b50c5fda22bc4f335fa 100644
 3--- a/.gitignore
 4+++ b/.gitignore
 5@@ -1,9 +1,8 @@
 6 locals.zsh
 7 log/.zsh_history
 8 projects.zsh
 9-custom/*
10-!custom/example
11-!custom/example.zsh
12+custom/example
13+custom/example.zsh
14 *.swp
15 !custom/example.zshcache
16 cache/
17diff --git a/custom/plugins/sfffe/sfffe.plugin.zsh b/custom/plugins/sfffe/sfffe.plugin.zsh
18new file mode 100644
19index 0000000000000000000000000000000000000000..a0f03490815098f8f91ee7a6d68d55135c38363b
20--- /dev/null
21+++ b/custom/plugins/sfffe/sfffe.plugin.zsh
22@@ -0,0 +1,28 @@
23+# ------------------------------------------------------------------------------
24+#          FILE:  sfffe.plugin.zsh
25+#   DESCRIPTION:  search file for FE
26+#        AUTHOR:  yleo77 (ylep77@gmail.com)
27+#       VERSION:  0.1
28+#       REQUIRE:  ack
29+# ------------------------------------------------------------------------------
30+
31+if [ ! -x $(which ack) ]; then
32+    echo  \'ack\' is not installed!
33+    exit -1
34+fi
35+
36+ajs() {
37+    ack "$@" --type js
38+}
39+
40+acss() {
41+    ack "$@" --type css
42+}
43+
44+fjs() {
45+    find ./ -name "$@*" -type f | grep '\.js'
46+}
47+
48+fcss() {
49+    find ./ -name "$@*" -type f | grep '\.css'
50+}
51diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
52index ab9c0c848959b332ce241f07d8bf6040bf631548..b9ea06844b3c48666c3546daef2cde18d73f35c7 100644
53--- a/plugins/git-flow/git-flow.plugin.zsh
54+++ b/plugins/git-flow/git-flow.plugin.zsh
55@@ -20,6 +20,12 @@
56 #     c. Or, use this file as a oh-my-zsh plugin.
57 #
58 
59+#Alias
60+alias gf='git flow'
61+alias gcd='git checkout develop'
62+alias gch='git checkout hotfix'
63+alias gcr='git checkout release'
64+
65 _git-flow ()
66 {
67 	local curcontext="$curcontext" state line
68diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
69index 6b91b4a7246c8ae59616bad386f6af1a6bde4dba..aad7761897f24a271707535f749bcff388c8bdf2 100644
70--- a/plugins/git/git.plugin.zsh
71+++ b/plugins/git/git.plugin.zsh
72@@ -54,9 +54,9 @@ compdef gcount=git
73 alias gcl='git config --list'
74 alias gcp='git cherry-pick'
75 compdef _git gcp=git-cherry-pick
76-alias glg='git log --stat --max-count=5'
77+alias glg='git log --stat --max-count=10'
78 compdef _git glg=git-log
79-alias glgg='git log --graph --max-count=5'
80+alias glgg='git log --graph --max-count=10'
81 compdef _git glgg=git-log
82 alias glgga='git log --graph --decorate --all'
83 compdef _git glgga=git-log
84@@ -72,7 +72,10 @@ alias grh='git reset HEAD'
85 alias grhh='git reset HEAD --hard'
86 alias gclean='git reset --hard && git clean -dfx'
87 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
88-alias gf='git ls-files | grep'
89+
90+#remove the gf alias
91+#alias gf='git ls-files | grep'
92+
93 alias gpoat='git push origin --all && git push origin --tags'
94 alias gmt='git mergetool --no-prompt'
95 compdef _git gm=git-mergetool