zsh_dots 0.6.0 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/config/gitconfig +3 -2
- data/config/gitignore +3 -0
- data/config/vimrc +8 -1
- data/lib/plugins/git/git.plugin.zsh +26 -23
- data/lib/ruby/dots/version.rb +1 -1
- metadata +14 -18
data/config/gitconfig
CHANGED
@@ -11,8 +11,8 @@
|
|
11
11
|
on = branch
|
12
12
|
br = branch
|
13
13
|
co = checkout
|
14
|
-
|
15
|
-
|
14
|
+
blog = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset' --decorate
|
15
|
+
l = !git blog
|
16
16
|
unstage = reset HEAD
|
17
17
|
staged = diff --cached
|
18
18
|
unstaged = diff
|
@@ -29,6 +29,7 @@
|
|
29
29
|
ship = !git to-master
|
30
30
|
rename-branch = !export GIT_BRANCH=`git current-branch` && git checkout master && git branch -m $GIT_BRANCH $1
|
31
31
|
delete-branch = !export GIT_BRANCH=`git current-branch` && git checkout master && git branch -D $GIT_BRANCH
|
32
|
+
prepare = rebase --interactive origin/master
|
32
33
|
[apply]
|
33
34
|
whitespace = warn
|
34
35
|
[color]
|
data/config/gitignore
CHANGED
data/config/vimrc
CHANGED
@@ -144,6 +144,9 @@ let Grep_Skip_Dirs = 'RCS CVS SCCS .svn generated .sass-cache .git'
|
|
144
144
|
set grepprg=/bin/grep\ -nH
|
145
145
|
" Enforce Ruby 1.9 syntax on this line
|
146
146
|
map <leader>h :s/:\([a-z0-9_]\+\)\s*=>/\1: /g<cr>
|
147
|
+
" Easy saving of files
|
148
|
+
nnoremap Z :w<cr>
|
149
|
+
nnoremap ZZ :wq<cr>
|
147
150
|
|
148
151
|
|
149
152
|
""
|
@@ -245,6 +248,10 @@ set background=light
|
|
245
248
|
map <C-t> :CommandT<cr>
|
246
249
|
" Pressing ,ss will toggle and untoggle spell checking
|
247
250
|
map <leader>ss :setlocal spell!<cr>
|
251
|
+
" Alternate between tabs
|
252
|
+
map <leader>m :tabn<cr>
|
253
|
+
map <C-s> :w<cr>
|
254
|
+
map <leader>s :w<cr>
|
248
255
|
|
249
256
|
" Remap :W => :w to avoid errors
|
250
257
|
command! W w
|
@@ -256,7 +263,7 @@ command! W w
|
|
256
263
|
let g:vroom_use_binstubs = 1
|
257
264
|
let g:vroom_use_colors = 1
|
258
265
|
let g:vroom_map_keys = 0
|
259
|
-
let g:vroom_spec_command = 'rspec --format=documentation '
|
266
|
+
let g:vroom_spec_command = 'bundle exec rspec --format=documentation '
|
260
267
|
let g:vroom_test_unit_command = 'bundle exec ruby -Itest '
|
261
268
|
"let g:vroom_test_unit_command = 'rtest '
|
262
269
|
|
@@ -1,36 +1,29 @@
|
|
1
1
|
# Aliases
|
2
2
|
alias g='git'
|
3
3
|
compdef g=git
|
4
|
-
|
5
|
-
|
4
|
+
|
5
|
+
# Branching
|
6
6
|
alias gu='git pull'
|
7
7
|
compdef _git gl=git-pull
|
8
8
|
alias gur='git pull --rebase'
|
9
9
|
compdef _git gl=git-pull
|
10
|
-
alias gup='git fetch && git rebase'
|
11
|
-
compdef _git gup=git-fetch
|
12
10
|
alias gp='git push'
|
13
11
|
compdef _git gp=git-push
|
14
12
|
alias gpf='git push tubbo'
|
15
13
|
compdef _git gpf=git-push
|
16
14
|
gdv() { git diff -w "$@" | view - }
|
17
15
|
compdef _git gdv=git-diff
|
18
|
-
alias gc='git commit -v'
|
19
|
-
compdef _git gc=git-commit
|
20
|
-
alias gca='git commit -v -a'
|
21
|
-
compdef _git gca=git-commit
|
22
16
|
alias gco='git checkout'
|
23
17
|
compdef _git gco=git-checkout
|
24
|
-
alias gcm='git checkout master'
|
25
18
|
alias gb='git branch'
|
26
19
|
compdef _git gb=git-branch
|
27
20
|
alias gba='git branch -a'
|
28
21
|
compdef _git gba=git-branch
|
29
|
-
alias
|
30
|
-
compdef
|
31
|
-
|
32
|
-
|
33
|
-
alias gl='git
|
22
|
+
alias gm='git merge'
|
23
|
+
compdef _git gm=git-merge
|
24
|
+
|
25
|
+
# Logging and Viewing
|
26
|
+
alias gl='git blog'
|
34
27
|
compdef _git glg=git-log
|
35
28
|
alias gls='git log --stat --max-count=5'
|
36
29
|
compdef _git gls=git-log
|
@@ -38,22 +31,28 @@ alias glg='git log --graph --max-count=5'
|
|
38
31
|
compdef _git glg=git-log
|
39
32
|
alias lol='git lol'
|
40
33
|
compdef _git lol=git-log
|
34
|
+
alias gcount='git shortlog -sn'
|
35
|
+
compdef gcount=git
|
36
|
+
alias gst='git status'
|
37
|
+
compdef _git gst=git-status
|
41
38
|
alias gsts='git status -s'
|
42
39
|
compdef _git gss=git-status
|
43
|
-
alias ga='git add'
|
44
|
-
compdef _git ga=git-add
|
45
|
-
alias gm='git merge'
|
46
|
-
compdef _git gm=git-merge
|
47
|
-
alias gls="git l"
|
48
|
-
compdef _git gls=git-log
|
49
|
-
alias grv='git remote -v'
|
50
|
-
compdef _get grv=git-remote
|
51
40
|
alias gd='git diff'
|
52
41
|
compdef _get grv=git-diff
|
53
42
|
alias gg='git grep'
|
54
43
|
compdef _get gg=git-grep
|
55
44
|
alias gbl='git blame'
|
56
45
|
compdef _get gbl=git-blame
|
46
|
+
|
47
|
+
# Manipulation
|
48
|
+
alias gcp='git cherry-pick'
|
49
|
+
compdef _git gcp=git-cherry-pick
|
50
|
+
alias ga='git add'
|
51
|
+
compdef _git ga=git-add
|
52
|
+
alias gls="git l"
|
53
|
+
compdef _git gls=git-log
|
54
|
+
alias grv='git remote -v'
|
55
|
+
compdef _get grv=git-remote
|
57
56
|
alias gt='git reset'
|
58
57
|
compdef _get gt=git-reset
|
59
58
|
alias gth='git reset --hard'
|
@@ -62,6 +61,10 @@ alias gts='git reset --soft'
|
|
62
61
|
compdef _get gt=git-reset
|
63
62
|
alias gthh='git reset --hard HEAD'
|
64
63
|
compdef _get gt=git-reset
|
64
|
+
alias gc='git commit -v'
|
65
|
+
compdef _git gc=git-commit
|
66
|
+
alias gca='git commit -v -a'
|
67
|
+
compdef _git gca=git-commit
|
65
68
|
|
66
69
|
# Stash
|
67
70
|
alias gs='git stash save'
|
@@ -69,7 +72,7 @@ compdef _get gsh=git-stash
|
|
69
72
|
alias gsp='git stash pop'
|
70
73
|
compdef _get gsh=git-stash
|
71
74
|
|
72
|
-
#
|
75
|
+
# Rebase
|
73
76
|
alias gr='git rebase'
|
74
77
|
compdef _get gg=git-rebase
|
75
78
|
alias grc='git rebase --continue'
|
data/lib/ruby/dots/version.rb
CHANGED
metadata
CHANGED
@@ -1,59 +1,59 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: zsh_dots
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
+
version: 0.6.2
|
4
5
|
prerelease:
|
5
|
-
version: 0.6.0
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Tom Scott
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-
|
12
|
+
date: 2013-02-03 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
|
-
|
16
|
-
|
15
|
+
name: thor
|
16
|
+
requirement: !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
20
20
|
- !ruby/object:Gem::Version
|
21
21
|
version: '0'
|
22
|
-
|
22
|
+
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
|
24
|
+
version_requirements: !ruby/object:Gem::Requirement
|
25
25
|
none: false
|
26
26
|
requirements:
|
27
27
|
- - ! '>='
|
28
28
|
- !ruby/object:Gem::Version
|
29
29
|
version: '0'
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
|
-
|
32
|
-
|
31
|
+
name: activemodel
|
32
|
+
requirement: !ruby/object:Gem::Requirement
|
33
33
|
none: false
|
34
34
|
requirements:
|
35
35
|
- - ! '>='
|
36
36
|
- !ruby/object:Gem::Version
|
37
37
|
version: '0'
|
38
|
-
|
38
|
+
type: :runtime
|
39
39
|
prerelease: false
|
40
|
-
|
40
|
+
version_requirements: !ruby/object:Gem::Requirement
|
41
41
|
none: false
|
42
42
|
requirements:
|
43
43
|
- - ! '>='
|
44
44
|
- !ruby/object:Gem::Version
|
45
45
|
version: '0'
|
46
46
|
- !ruby/object:Gem::Dependency
|
47
|
-
|
48
|
-
|
47
|
+
name: rake
|
48
|
+
requirement: !ruby/object:Gem::Requirement
|
49
49
|
none: false
|
50
50
|
requirements:
|
51
51
|
- - ! '>='
|
52
52
|
- !ruby/object:Gem::Version
|
53
53
|
version: '0'
|
54
|
-
|
54
|
+
type: :development
|
55
55
|
prerelease: false
|
56
|
-
|
56
|
+
version_requirements: !ruby/object:Gem::Requirement
|
57
57
|
none: false
|
58
58
|
requirements:
|
59
59
|
- - ! '>='
|
@@ -92,7 +92,6 @@ files:
|
|
92
92
|
- config/vimrc
|
93
93
|
- config/zshenv
|
94
94
|
- config/zshrc
|
95
|
-
- etc/irssi/config
|
96
95
|
- etc/irssi/config.example
|
97
96
|
- etc/irssi/default.theme
|
98
97
|
- etc/irssi/nickserv.networks
|
@@ -163,9 +162,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
163
162
|
requirements:
|
164
163
|
- - ! '>='
|
165
164
|
- !ruby/object:Gem::Version
|
166
|
-
segments:
|
167
|
-
- 0
|
168
|
-
hash: -4117296198963250433
|
169
165
|
version: '0'
|
170
166
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
171
167
|
none: false
|