Gaetan Semet
b1307d9e19
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
plugins/jsontools/jsontools.plugin.zsh
templates/zshrc.zsh-template
2014-04-17 16:06:34 +02:00
ncanceill
2dfcc5af42
mention $ZSH_CUSTOM as suggested in #2295
2014-04-17 16:05:23 +02:00
ncanceill
f8e9e82a63
suggest setting $LANG to fix #1286 and fix #1823
2014-04-17 16:05:23 +02:00
Luke Horvat
b369baf1c9
Fixed typos + made wording more consistent in zshrc.zsh-template
2014-04-17 16:02:38 +02:00
Luke Horvat
5f09d0f6dd
Fixed typos + made wording more consistent in zshrc.zsh-template
2014-03-25 22:12:30 +11:00
Gaetan Semet
92ed38cb85
Merge remote-tracking branch 'cadusk/master'
...
Conflicts:
lib/aliases.zsh
templates/zshrc-linux.zsh
templates/zshrc-mac.zsh
tools/install.sh
2014-03-24 11:56:16 +01:00
Gaetan Semet
5afa441d66
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
templates/zshrc.zsh-template
2014-03-24 11:54:41 +01:00
Carlos Cardoso
cde788ed19
added git-fast to oh-my-zsh startup config
2014-03-23 23:39:43 -03:00
Carlos Cardoso
ad4e88bc23
Merged blessed.
2014-03-23 19:58:16 -03:00
Carlos Cardoso
eff8820e29
Unified aliases in oh-my-zsh aliases file.
2014-03-23 19:28:27 -03:00
ncanceill
6889dfaa46
$ZSH is the OMZ installation folder, not configuration
2014-03-23 15:03:36 +01:00
ncanceill
04c2d29398
mention $ZSH_CUSTOM as suggested in #2295
2014-03-23 15:03:16 +01:00
ncanceill
f9ad3686bb
suggest setting $LANG to fix #1286 and fix #1823
2014-03-23 15:02:58 +01:00
Carlos Cardoso
80782afeca
New git aliases.
2014-03-22 22:53:30 -03:00
Robby Russell
95302af79b
Merge pull request #646 from whittle/master
...
Change default zshrc to export $ZSH (as required by check_for_upgrade.sh).
2014-03-22 13:51:47 -07:00
Gaetan Semet
4888217c85
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
README.textile
lib/aliases.zsh
templates/zshrc.zsh-template
tools/install.sh
2014-03-14 16:50:51 +01:00
Gaetan Semet
644aac2bf5
moved my git plugin to git2
...
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-03 14:18:06 +01:00
Gaetan Semet
ad426a6579
Merge remote-tracking branch 'cadusk/master'
...
Conflicts:
templates/zshrc-mac.zsh
2014-01-02 10:46:36 +01:00
Carlos Cardoso
00b58b872a
Updated linux template.
2013-12-21 23:15:29 -02:00
Carlos Cardoso
506ddcf190
Updated zshrc template for mac
2013-12-21 23:12:27 -02:00
Gaetan Semet
4ab34ba94c
Merge remote-tracking branch 'cadusk/master'
...
Conflicts:
README.textile
lib/aliases.zsh
templates/zshrc-linux.zsh
templates/zshrc-mac.zsh
templates/zshrc.zsh-template
2013-12-19 17:27:55 +01:00
Carlos Cardoso
41b9bac3ec
Added appengine to path for linux.
2013-12-18 12:52:56 -02:00
Carlos Cardoso
7728107eba
Merged upstream changes.
2013-12-17 01:31:15 -02:00
Carlos Cardoso
0fb7e54b90
Merged upstream configuration.
2013-12-17 01:26:27 -02:00
Foivos
e97811913b
Improve comments
2013-12-08 07:16:40 +02:00
Foivos
be6b1b3b8f
Improve comments
2013-12-08 07:11:33 +02:00
Gaetan Semet
24f2838f0b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
README.textile
lib/aliases.zsh
plugins/repo/repo.plugin.zsh
templates/zshrc.zsh-template
themes/ys.zsh-theme
2013-12-03 09:41:48 +01:00
Robby Russell
0d352109e9
Merge pull request #1087 from avit/install-template
...
Add configuration placeholders to installer template
2013-12-02 23:49:00 -08:00
Robby Russell
44c7fd976b
Merge pull request #1928 from dongweiming/add-hist-stamp
...
Add option for show in the command execution time stamp in the history
2013-12-02 23:38:26 -08:00
Gaetan Semet
a587b6f98a
upgrade my zshrc
2013-11-25 11:34:54 +01:00
Gaetan Semet
6d372d6b25
imported my local zshrc changes (linux) + sync up mac template
2013-11-18 15:02:43 +01:00
Gaetan Semet
412a38a989
Merge remote-tracking branch 'cadusk/master'
...
Conflicts:
templates/zshrc-linux.zsh
templates/zshrc-mac.zsh
templates/zshrc.zsh-template
2013-11-18 14:57:43 +01:00
Gaetan Semet
778b60cf38
updated zshrc mac template
...
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-11-16 23:57:46 +01:00
Carlos Cardoso
8727fc77a6
Fixing templates.
2013-11-15 13:20:44 -02:00
Carlos Cardoso
fe2304ca54
Merge branch 'linux'
...
* linux:
custom linux changes.
2013-11-15 13:10:41 -02:00
Carlos Cardoso
bb9cc48de7
custom linux changes.
2013-11-15 13:02:46 -02:00
Carlos Cardoso
eb6f4b8244
fixing postgres plugin reference.
2013-11-13 01:41:23 -02:00
Carlos Cardoso
422a4224fb
customzing defaults.
2013-11-13 00:31:10 -02:00
Andrew Vit
1e9f55f09d
Add configuration placeholders to installer template
...
Although the zshrc template adds a PATH= string, this is overwritten by the installer script.
This allows it to be placed anywhere in the file instead of having to append at the end.
2013-10-25 14:50:27 -07:00
Gaetan Semet
bd32698531
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
.gitignore
plugins/git/git.plugin.zsh
plugins/jump/jump.plugin.zsh
templates/zshrc.zsh-template
2013-09-24 14:30:27 +02:00
David Strawn
9d2b5c841e
Fixed comments in zshrc.zsh-template about disabling auto updates.
...
Previously they did not make sense nor were they accurate.
2013-09-14 12:26:33 -06:00
Gaetan Semet
fc27f4088b
Merge remote-tracking branch 'dlintw/2024-list-theme-features'
2013-09-11 15:33:29 +02:00
Daniel YC Lin
8f18bd38fd
show themes featues by grep
2013-08-06 17:03:21 +08:00
dongweiming
77cf869605
Add option for show in the command execution time stamp in the history
2013-06-30 20:54:23 +08:00
Gaetan Semet
60f4ae1bed
Merge remote-tracking branch 'cadusk/master'
...
Conflicts:
templates/zshrc-linux.zsh
templates/zshrc-mac.zsh
templates/zshrc.zsh-template
2013-06-13 17:13:13 +02:00
Stibbons
2703f6c241
Changed default plugins for mac and linux templates
2013-06-05 23:56:06 +02:00
Gaetan Semet
781364a35a
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
lib/theme-and-appearance.zsh
plugins/tmux/tmux.plugin.zsh
2013-06-05 11:10:38 +02:00
Carlos Cardoso
b501522a21
Changing theme.
2013-06-03 23:09:42 -03:00
Carlos Cardoso
ee3267f30d
Merged official branch changes.
2013-06-03 22:12:29 -03:00
Robby Russell
a2c8db9eb3
Resolving conflict in #1266 merge
2013-04-23 20:30:21 -07:00
