linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2,489 commits 3 branches 0 tags 154 MiB
Commit graph

2,489 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gaetan Semet
e026833132 typo 2014-02-03 14:26:21 +01:00
Gaetan Semet
571f0838d7 restored official git plugin 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-02-03 14:26:14 +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
c38877c19b backslash gitk aliases 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-02-03 14:09:01 +01:00
Gaetan Semet
287635e6e1 do not add git alias in aliases.zsh 
(this is a modification added by cadusk branch)

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-02-03 14:08:59 +01:00
Gaetan Semet
c9f6076140 Merge remote-tracking branch 'upstream/master' 2014-01-30 15:44:17 +01:00
Gaetan Semet
1279533359 fix gclean (*.BASE.*) 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-01-30 15:44:09 +01:00
Gaetan Semet
e4786d1153 new aliases for buildbot 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-01-30 15:44:09 +01:00
Robby Russell
df0305aba5 Merge pull request #2368 from lumbric/master 
fix name schema for sudo plugin
 2014-01-28 16:22:14 -08:00
Gaetan Semet
43da92c071 Merge remote-tracking branch 'upstream/master' 2014-01-18 12:09:59 +01:00
Robby Russell
d485044169 Merge pull request #2389 from driver2000/patch-1 
Fix bad right prompt placing.
 2014-01-06 20:06:10 -08:00
Robby Russell
a609fd5616 Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find 
Fixes tmuxinator plugin `find` on OSX
 2014-01-06 20:03:43 -08:00
Pablo Cantero
4354f91171 Fixes tmuxinator plugin find on OSX 2014-01-03 11:52:33 -02:00
Robby Russell
e2838f75f0 Merge pull request #2396 from soluwalana/master 
Fix WIP false positive
 2014-01-02 16:01:28 -08:00
Sam O
d60522c7a2 escape dashes 2014-01-02 15:53:34 -08:00
Sam O
827d9dfcb4 Update git.plugin.zsh 2014-01-02 15:48:09 -08:00
Gaetan Semet
ad426a6579 Merge remote-tracking branch 'cadusk/master' 
Conflicts:
	templates/zshrc-mac.zsh
 2014-01-02 10:46:36 +01:00
Daniele
3e5e2d45e9 Fix bad right prompt placing. 2013-12-31 12:41:28 +01:00
Carlos Cardoso
abb50b956a Merge remote-tracking branch 'origin/master' 
* origin/master:
  Added appengine to path for linux.
 2013-12-21 23:15:40 -02: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
lumbric
b58b996b40 fix name schema for sudo plugin 
Plugin won't load automatically if added to variable $plugins, if name schema different than $name/$name.plugin.zsh is used (see is_plugin() in oh-my-zsh.sh).
 2013-12-21 19:49:44 +01:00
Gaetan Semet
2a0ecb9baf Merge remote-tracking branch 'upstream/master' 2013-12-19 17:28:00 +01: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
Gaetan Semet
4bd8bf4d7f new alias: apt get update saguagu 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-19 17:25:02 +01:00
Gaetan Semet
f0f805d455 better bb_ function 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-19 17:24:41 +01:00
Robby Russell
a38af27991 Revert "Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory." 
This reverts commit 152e1e07e0.
 2013-12-18 17:03:33 -08:00
Robby Russell
c9e5adb637 Merge pull request #2358 from n-st/master 
Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
 2013-12-18 17:01:01 -08:00
n.st
152e1e07e0 Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory. 2013-12-18 18:27:20 +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
Gaetan Semet
f85a067dac rra. and rs. aliases in repo plugin 2013-12-12 12:52:21 +01:00
Gaetan Semet
6604587f5b doc in git plugin 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-12 12:52:04 +01:00
Gaetan Semet
afc63fd398 git plugin: new alias for gfa + gpr 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-11 16:01:34 +01:00
Gaetan Semet
e80764134a git plugin: git rewrite history aliases + fix gclean 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-11 15:59:56 +01:00
Gaetan Semet
4470dc59ec Fix in git plugin 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-09 11:19:06 +01:00
Gaetan Semet
e7dbded054 Merge remote-tracking branch 'upstream/master' 2013-12-09 10:52:48 +01:00
Gaetan Semet
4d9b06d3bc reworked cactus merge scripts 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-09 10:52:42 +01:00
Robby Russell
357ab4912b Merge pull request #2316 from BBonifield/master 
Making auto-correction off by default.

Okay, I don't feel so strongly these days about this.
 2013-12-04 21:02:58 -08:00
Bob Bonifield
f082d7a245 Making auto-correction off by default 
- Allows for the user to turn on auto-correction using the
$ENABLE_CORRECTION variable
- Adds aliases regardless of variable assignment to aid users that use
setopt to turn correction back on in their zshrc
 2013-12-04 20:59:57 -07:00
Robby Russell
8c93142b13 Merge pull request #2303 from petervanderdoes/git-flow-avh 
Update git-flow-avh 1.7.0
 2013-12-03 12:51:39 -08:00
Robby Russell
6fa64b7199 Merge pull request #2296 from pstadler/master 
check_for_upgrade.sh: source ~/.profile only if it exists
 2013-12-03 12:51:00 -08:00
Gaetan Semet
5c71237045 add gitclean alias 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-03 18:05:46 +01:00
Peter van der Does
2ffca06806 Update git-flow-avh 1.7.0 2013-12-03 08:56:18 -05:00
Gaetan Semet
4fb40a1f04 fix git checkout master 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-03 10:25:32 +01:00
Patrick Stadler
858c515df2 source ~/.profile only if it exists 2013-12-03 09:52:51 +01:00
Gaetan Semet
7499bbbf04 reorganised git plugin 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-03 09:49:51 +01: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
4e34588a5b Merge pull request #2208 from onemouth/master 
Update git.plugin.zsh
 2013-12-03 00:20:36 -08:00