Locojay
078c9e1689
alias fix
2011-06-05 20:48:10 -04:00
Locojay
500ce1d5ca
Merge branch 'mergetest'
2011-06-05 20:42:07 -04:00
Locojay
d2bf5b9226
merge
2011-06-05 20:41:46 -04:00
Locojay
c23e02722e
ashlydev
2011-06-05 20:38:21 -04:00
Locojay
abd3427aef
Merge remote-tracking branch 'ashleydev/master' into mergetest
...
Conflicts:
custom/aliases.zsh
plugins/git/git-prompt-old.plugin.zsh
2011-06-05 20:32:03 -04:00
Locojay
b72cbe35b5
Merge remote-tracking branch 'robbyrussel/master' into mergetest
...
Conflicts:
lib/git.zsh
oh-my-zsh.sh
2011-06-05 20:31:29 -04:00
Locojay
265abcbd0f
adding brew editor
2011-06-05 20:28:11 -04:00
Robby Russell
ed990f61ff
Merge pull request #400 from mkomitee/master
...
Fix bug introduced in pull request #395 which impacts users who DISABLE_AUTO_UPDATE
2011-06-05 01:04:30 -07:00
Michael Komitee
9b4a89f327
Fix bug from Pull request #395
...
#395 broke oh-my-zsh for users who disable check-for-updates
2011-06-04 14:03:10 -04:00
Robby Russell
e8bd400bff
Merge pull request #395 from vguerci/upgrade-before-init
...
Upgrade before init
2011-06-04 03:12:23 -07:00
vguerci
7c9474508c
[upgrade] before init (no reload needed unless oh-my-zsh.sh has been modified)
2011-06-04 11:52:13 +02:00
Andrew Hodges
0c41b1cdc3
Colorize Install & Upgrade Scripts
...
Make tools/install.sh and tools/upgrade.sh pretty.
2011-06-03 14:05:25 -04:00
Robby Russell
3ed19c4895
Merge pull request #371 from nebirhos/master
...
Another (useless) theme!
2011-06-03 08:50:31 -07:00
Robby Russell
3ddc49cafd
Merge pull request #378 from secondplanet/master
...
Humza.zsh-theme
2011-06-03 08:50:07 -07:00
Robby Russell
30787d82bf
Merge pull request #391 from mattdoran/master
...
Fix typos in svn plugin
2011-06-03 08:49:44 -07:00
Matt Doran
9b63a03bcf
Fix typos in the svn plugin that would cause calls to 'svn' when not in an svn working copy.
2011-06-04 00:32:05 +10:00
Ashley Dev
acc1023bfd
fix up the git prompt when it's a fresh repo
2011-06-02 14:44:36 -07:00
Ashley Dev
fcbca579ae
Update plugins/git:
...
- move aliases into plugins/git/git-aliases.plugin.zsh
- move git prompt info into plugins/git/git-prompt-old.plugin.zsh
- add revamped git prompt info into plugins/git/git-prompt.plugin.zsh
- plugins/git/git.plugin.zsh now just sources the above files
Added themes/ashleydev.theme.zsh that takes advantage of the new git prompt info
2011-06-02 11:25:01 -07:00
Ashley Dev
d1088b2860
add file header, and better comments and info about options that are available in the sample.
2011-06-02 10:35:22 -07:00
Ashley Dev
3bb66a6ef7
Merge branch 'master' of github.com:ashleydev/oh-my-zsh
2011-06-02 10:19:57 -07:00
Ashley Dev
d40d2cb78d
updates and cleanups to git prompt stuff
2011-06-02 10:19:10 -07:00
Robby Russell
141d355e2e
Merge pull request #385 from sunaku/theme
...
add "sunaku" theme, see http://ompldr.org/vOHcwZg
2011-06-02 08:50:33 -07:00
Suraj N. Kurapati
c1b5d72830
add "sunaku" theme, see http://ompldr.org/vOHcwZg
2011-06-01 20:39:07 -07:00
Robby Russell
3bb21afa88
Merge pull request #382 from miloshadzic/master
...
miloshadzic theme
2011-06-01 14:45:35 -07:00
Robby Russell
4b828cda28
Merge pull request #380 from brianjriddle/master
...
fixes for ant plugin. tested on mac.
2011-06-01 14:39:08 -07:00
Robby Russell
1f9b31ea34
Merge pull request #383 from alanpeabody/master
...
My theme
2011-06-01 14:05:12 -07:00
Miloš Hadžić
0d476e02cd
Adds my theme
2011-06-01 12:45:15 +02:00
Robby Russell
7b0b83623f
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
2011-06-01 09:33:49 +02:00
Robby Russell
23a082df12
Revert "Added my zsh theme file, heavily based on sjl's" as it relies
...
on a dotfile to be in ~/bin.
This reverts commit f2f34f5404
2011-06-01 09:33:12 +02:00
Robby Russell
643a4e77f6
Merge pull request #375 from betawaffle/rollback-366
...
Rollback of Pull #366
2011-05-31 21:24:01 -07:00
Robby Russell
ba0f13604a
Merge pull request #381 from thePapacy/fix-git-zsh
...
Fix deleted in git.zsh
2011-05-31 21:06:10 -07:00
Locojay
50d537fd5e
zshrc fix
2011-05-31 19:33:48 -04:00
Michael Hanson
c014dca141
Fix deleted in git.zsh
2011-05-31 15:59:38 -07:00
Brian Riddle
f487897175
fix double -f and corrected format.
...
-f%m was getting called twice in the stat_cmd
corrected format of stat command from y to Y.
2011-05-31 14:16:43 +02:00
Locojay
5ff612e00e
Merge branch 'master' of https://github.com/locojay/oh-my-zsh
2011-05-30 21:56:24 -04:00
Locojay
e33a71dc6a
brew python fix
2011-05-30 21:43:36 -04:00
Locojay
7180e604e9
brew to custom
2011-05-30 21:13:06 -04:00
Second Planet
93dab36fcb
added humza.zsh-theme
2011-05-30 19:10:26 -04:00
Andrew Hodges
9801ad6453
Remove Uneeded Lines
2011-05-30 11:10:35 -04:00
Andrew Hodges
1e3b441ce7
Rollback of Pull #366
...
sorin-ionescu had some good points.
2011-05-30 10:09:00 -04:00
Locojay
6435440e1d
fixed brew conflict with python
2011-05-29 22:58:35 -04:00
Locojay
90ad453902
merging robbyrussel
2011-05-29 22:42:03 -04:00
nebirhos
1c2eb40e87
Added nebirhos theme
2011-05-30 01:05:38 +02:00
Robby Russell
142c03dbd2
Merge pull request #359 from theunraveler/master
...
Rewrite of plugin override
2011-05-29 03:56:33 -07:00
Robby Russell
d708f5ddc1
Merge pull request #363 from Blattlaus/master
...
Ant plugin: stat command doesn't work under linux
2011-05-29 03:54:40 -07:00
Robby Russell
40a737ee13
Merge pull request #366 from betawaffle/master
...
Add/update plugins: brew, rvm, node, npm, pow, and thor.
2011-05-29 03:54:05 -07:00
Robby Russell
b0c9bc88ef
Merge pull request #368 from trapd00r/master
...
add trapd00r theme
2011-05-29 03:49:51 -07:00
Robby Russell
0eba5364bf
Merge pull request #365 from briankftse/master
...
Added a new theme
2011-05-29 03:49:27 -07:00
Magnus Woldrich
205e2f4842
add trapd00r theme
2011-05-29 11:55:24 +02:00
Andrew Hodges
6b86636413
Merge branch 'plugins'
2011-05-28 13:14:42 -04:00
