a1c5abf6bf
Merge pull request #3055 from sachin21/remove_alias
...
This alias is conflict cause.
2014-08-31 10:25:34 -07:00
ac053f4211
This alias is conflict cause
2014-08-24 00:50:54 +09:00
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
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
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
5e328e3a9c
Solaris portability tweaks.
2014-07-11 18:41:49 +05:30
2927ce3714
Fix POST_1_7_2_GIT check for parse_git_dirty submodules.
2014-07-03 14:45:49 +12:00
676fb4e420
Fix parse_git_dirty() when status.branch is set.
2014-07-03 14:38:19 +12:00
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
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
09fdf76311
ignore usernames beginning with underscore
2014-06-10 13:33:33 +02:00
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
514693125b
added prefix/suffix variable for customizability
2014-05-26 10:47:51 +02:00
59c8fcc712
added new function to get number of commits ahead of remote
2014-05-25 14:13:21 +02:00
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
b64e695b35
Ordering nocorrect aliases alphabetically
2014-05-24 20:07:06 +02:00
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
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
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
9385b3ee0a
set exclude-dir or exclude grep flags only if available
2014-04-19 00:03:36 +04:00
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
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
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
27965fedec
Merge pull request #2390 from LFDM/updating_spectrum
...
Updates and refactors spectrum.zsh
2014-03-23 11:39:07 -07:00
12e30faaca
Fix export syntax of $GREP_OPTIONS
...
Fixes #2641 , #2642
2014-03-23 02:09:38 +01:00
393c805f7e
Merge pull request #1162 from nXqd/patch-1
...
avoid VCS folders
2014-03-22 16:07:51 -07:00
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
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
c5413d7dd1
Aligned comments
2014-03-20 19:34:43 -07:00
55a9d685fd
Update key-bindings.zsh
...
Aligned comments
2014-03-20 19:29:06 -07:00
e537ee9db9
added terminfo keys verification
2014-03-20 19:10:44 -07:00
b56e8fb478
Ignore more users in ssh completion.
...
Signed-off-by: Mariusz Fik <fisiu@opensuse.org >
2014-03-16 18:14:34 +01:00
c9e7129341
Merge pull request #2602 from blueyed/use-default-hosts-completion-2
...
Use zsh's default for ':completion:*:hosts'
2014-03-15 16:03:30 -07:00
552aab6939
Merge pull request #2591 from kevinxucs/remove-extra-aliases
...
Removed unsolicited aliases.
2014-03-13 13:29:12 -07:00
71d9420637
Use zsh's default for ':completion:*:hosts'
...
The manual configuration of ':completion:*:hosts' causes some problems
(e.g. issue #1337 ), and misses useful information (especially from
~/.ssh/known_hosts; issue #690 and issue #1009 ).
The best option appears to be using zsh's default configuration for
':completion:*:hosts'.
While rebasing this for a new pull request (#1498 got closed by accident
and then requests to re-open it got ignored), it also drops the `users
off` setting: completion of user names can be useful, and the commit
adding it (c4434d2
) does not state why.
2014-03-13 17:48:58 +01:00
7adf66f942
Merge pull request #1355 from F30/key-bindings
...
Use terminfo key codes instead of hardcoded ones for key bindings
2014-03-13 08:07:24 -07:00
b71a2b9d0f
Removed unsolicited aliases.
...
Those aliases should be in user's .zshrc file, instead of being default.
2014-03-10 04:05:14 -04:00
48579ebf2b
Merge pull request #2341 from mcornella/title_backticks
...
Avoid evaluating special chars in $LINE on title command (fixes #2234 )
2014-03-08 14:30:55 -08:00
9bd9278b80
Merge pull request #2287 from rumpelsepp/master
...
Added/modified some useful aliases.
2014-03-08 08:10:34 -08:00
a951600b4e
Avoid 'title:parse error' with single quotes in $CMD
...
Fixes #2182
2014-02-21 22:16:12 +01:00
3e5de21dc5
Revert previous commit, escape %
2014-02-21 22:16:12 +01:00
b73ced397f
Use single quotes also in $LINE definiton
2014-02-21 22:16:12 +01:00
b0fbe0d11a
Avoid evaluating special chars in $LINE on title command ( fixes #2234 )
2014-02-21 22:16:12 +01:00
217d8f0540
fc -l 1
instead of history
in zsh_stats #2501
...
$HIST_STAMP breaks zsh_stats. see #2501
2014-02-06 17:29:33 +08:00
b0b79e0aba
No need to eval in rvm_prompt_info!
...
Just activate word-splitting.
2014-01-07 19:08:20 +01:00
85fde31991
Renames the file to prompt_info_functions.zsh
2014-01-06 09:58:40 +01:00
082607c165
Adds documentation.
2014-01-06 09:57:23 +01:00
72392a2c27
Adds all other dummy implementations.
2014-01-06 09:57:09 +01:00
6a40557a8b
Updates spectrum.zsh
2013-12-31 14:54:34 +01:00
c6aacf611d
Refactors ruby_prompts.zsh
2013-12-31 02:45:09 +01:00