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

361 commits

Author SHA1 Message Date
Gaetan Semet
cf1c065d71 Merge remote-tracking branch 'cadusk/master' 
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
 2014-10-07 11:53:12 +02:00
sachin21
ea229f80b3 This alias is conflict cause 2014-09-17 14:15:18 +02:00
Jingwen Owen Ou
c6f46c243d Fix missing add-zsh-hook 
In older version of zsh, `add-zsh-hook` is not available, causing issues like:

```
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:32: add-zsh-hook: function definition file not found
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:33: add-zsh-hook: function definition file not found
```

See https://github.com/robbyrussell/oh-my-zsh/issues/748. This patch pulls in the changes suggested in https://github.com/robbyrussell/oh-my-zsh/issues/748#issuecomment-37862691 by @mcornella and I have tested it on RHEL 5.
 2014-09-17 14:15:17 +02:00
Fredrik Fornwall
5e937a32ed Replace /usr/bin/env with env 
Some environments (such as Android) does not have /usr/bin.
 2014-09-17 14:15:17 +02:00
Carlos Cardoso
c95561b79f merged upstream in 2014-09-03 01:15:27 -03:00
Robby Russell
958c8f4390 Merge pull request #3045 from fornwall/remove-usr-bin 
Replace /usr/bin/env with env
 2014-08-31 10:40:19 -07:00
Robby Russell
be578d9e7a Merge pull request #3053 from jingweno/patch-1 
Fix missing add-zsh-hook
 2014-08-31 10:39:03 -07:00
Robby Russell
a1c5abf6bf Merge pull request #3055 from sachin21/remove_alias 
This alias is conflict cause.
 2014-08-31 10:25:34 -07:00
sachin21
ac053f4211 This alias is conflict cause 2014-08-24 00:50:54 +09:00
Jingwen Owen Ou
dc9e1764cf Fix missing add-zsh-hook 
In older version of zsh, `add-zsh-hook` is not available, causing issues like:

```
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:32: add-zsh-hook: function definition file not found
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:33: add-zsh-hook: function definition file not found
```

See https://github.com/robbyrussell/oh-my-zsh/issues/748. This patch pulls in the changes suggested in https://github.com/robbyrussell/oh-my-zsh/issues/748#issuecomment-37862691 by @mcornella and I have tested it on RHEL 5.
 2014-08-22 15:59:17 -07:00
Fredrik Fornwall
dac2a6e27a Replace /usr/bin/env with env 
Some environments (such as Android) does not have /usr/bin.
 2014-08-20 23:52:05 +02:00
Gaetan Semet
cdcda28bca Merge remote-tracking branch 'upstream/master' 2014-07-15 17:47:03 +02:00
Robby Russell
01da53e10f Merge pull request #2828 from r3dDoX/master 
removed a hardcoded 'origin' in git.zsh and added new function for number of commits ahead of remote
 2014-07-15 07:38:55 -07:00
Gaetan Semet
ec49ae1a98 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	lib/git.zsh
	plugins/common-aliases/common-aliases.plugin.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
 2014-07-03 16:18:02 +02:00
Albert Krewinkel
c5d9fc9968 git_prompt_info: ignore git-config errors 
Merged from #2906

The function `git_prompt_info` calls `git config` for its stdout output,
but doesn't handle the stderr output.  This can lead to problems,
e.g. if the git config file is unreadable for some reason (permissions
etc).

This fixes the issue by simply ignoring the stderr output.
 2014-06-28 10:12:20 +02:00
Mikhail S. Pobolovets
49161e7847 Add missing command wrapper for git 
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
 2014-06-28 10:12:19 +02:00
Carlos Cardoso
6a153ffedf merged changes from upstream 2014-06-24 21:25:20 -03:00
Will Boyce
09fdf76311 ignore usernames beginning with underscore 2014-06-10 13:33:33 +02:00
ncanceill
7fbbf28e6e return 0 when not a git repo 
before, 128 was returned, which could display an error,
but out of a git repo this should exit silently
fixes #2226
 2014-06-10 09:52:57 +02:00
r3dDoX
514693125b added prefix/suffix variable for customizability 2014-05-26 10:47:51 +02:00
r3dDoX
59c8fcc712 added new function to get number of commits ahead of remote 2014-05-25 14:13:21 +02:00
r3dDoX
3c485db8c7 replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0 2014-05-25 14:13:07 +02:00
Simon Courtois
b64e695b35 Ordering nocorrect aliases alphabetically 2014-05-24 20:07:06 +02:00
Simon Courtois
cd8d5c4410 Defining nocorrect aliases only when ENABLE_CORRECTION is "true" 
This commit move the nocorrect aliases definition so they're called
only when the user set ENABLE_CORRECTION to "true" to activate commands
autocorrection.
 2014-05-24 20:07:05 +02:00
Carlos Cardoso
53838bb9d1 theme customization based on avit and sporty_256 2014-04-26 23:29:34 -03:00
Gaetan Semet
316c46767e Merge remote-tracking branch 'upstream/master' 
Conflicts:
	tools/install.sh
 2014-04-23 14:45:49 +02:00
Robby Russell
01dcf51fdf Merge pull request #2502 from UniIsland/patch-1 
`fc -l 1` instead of `history` in zsh_stats, fixes #2501
 2014-04-19 12:54:35 -07:00
Robby Russell
8aa6e6a412 Merge pull request #2650 from kemko/patch-1 
don't add --exclude-dir to GREP_OPTIONS on FreeBSD
 2014-04-19 12:53:42 -07:00
Carlos Cardoso
793cbb9450 removed duplicate aliases 2014-04-19 11:47:19 -03:00
Carlos Cardoso
4b8a93d68a merged in blessed/master 2014-04-19 11:18:40 -03:00
Dmitriy
9385b3ee0a set exclude-dir or exclude grep flags only if available 2014-04-19 00:03:36 +04:00
Andre Eriksson
fefe8d143a Fix broken reverse-menu-complete keybinding. 
Since e537ee9, the reverse-menu-complete keybinding has no longer been
properly bound (it was accidentally bound to the delete key).

This commit again binds it to shift-tab.
 2014-04-17 16:05:38 +02:00
Marc Cornellà
62e59807f3 Escape % in $CMD variable 
Fixes formatting on some rare cases when a percent ends up
in the $CMD variable, like these below:

- When assigning a variable, $CMD ends up with the second parameter;
in this case, $CMD will contain '+%s%N', messing with the syntax:

 $ a=`date +%s%N`

- A function (or command in general) that contains a percent symbol:

 $ to\%() { echo $(( $1 * 100 / $3))\% } # $CMD=to%()
 $ to% 2 of 10 # $CMD=to%
 2014-04-17 16:05:35 +02:00
Marc Cornellà
611a10ece4 Fix export syntax of $GREP_OPTIONS 
Fixes #2641, #2642
 2014-04-17 16:05:04 +02:00
nXqd
c70b168c23 avoid VCS folders 2014-04-17 16:04:30 +02:00
Robby Russell
175310ae27 Merge pull request #2661 from mcornella/fix_title_tab_percent 
Fix escaping of $CMD of automatic title
 2014-03-27 21:31:04 -07:00
Andre Eriksson
9650861e56 Fix broken reverse-menu-complete keybinding. 
Since e537ee9, the reverse-menu-complete keybinding has no longer been
properly bound (it was accidentally bound to the delete key).

This commit again binds it to shift-tab.
 2014-03-26 15:12:39 +09:00
Marc Cornellà
5137e0e509 Escape % in $CMD variable 
Fixes formatting on some rare cases when a percent ends up
in the $CMD variable, like these below:

- When assigning a variable, $CMD ends up with the second parameter;
in this case, $CMD will contain '+%s%N', messing with the syntax:

 $ a=`date +%s%N`

- A function (or command in general) that contains a percent symbol:

 $ to\%() { echo $(( $1 * 100 / $3))\% } # $CMD=to%()
 $ to% 2 of 10 # $CMD=to%
 2014-03-25 21:14:20 +01: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
c31f9e6f09 Cleanup .orig files. 2014-03-23 20:18:19 -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
Robby Russell
27965fedec Merge pull request #2390 from LFDM/updating_spectrum 
Updates and refactors spectrum.zsh
 2014-03-23 11:39:07 -07:00
Marc Cornellà
12e30faaca Fix export syntax of $GREP_OPTIONS 
Fixes #2641, #2642
 2014-03-23 02:09:38 +01:00
Robby Russell
393c805f7e Merge pull request #1162 from nXqd/patch-1 
avoid VCS folders
 2014-03-22 16:07:51 -07:00
Robby Russell
9eacd7d589 Merge pull request #750 from blueyed/history-drop-default-append-history 
`setopt append_history` is not necessary.
 2014-03-22 13:59:19 -07:00
Alexei Danchenkov
32a7824182 Added a forward-delete fallback to bind Delete key 
Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.
 2014-03-21 09:24:59 -07:00
Alexei Danchenkov
c5413d7dd1 Aligned comments 2014-03-20 19:34:43 -07:00
Alexei Danchenkov
55a9d685fd Update key-bindings.zsh 
Aligned comments
 2014-03-20 19:29:06 -07:00