1
0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-24 19:10:28 +08:00
Commit Graph

307 Commits

Author SHA1 Message Date
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
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
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
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
Dmitriy
9385b3ee0a set exclude-dir or exclude grep flags only if available 2014-04-19 00:03:36 +04: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
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
Alexei Danchenkov
e537ee9db9 added terminfo keys verification 2014-03-20 19:10:44 -07:00
Mariusz Fik
b56e8fb478 Ignore more users in ssh completion.
Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
2014-03-16 18:14:34 +01:00
Robby Russell
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
Robby Russell
552aab6939 Merge pull request #2591 from kevinxucs/remove-extra-aliases
Removed unsolicited aliases.
2014-03-13 13:29:12 -07:00
Daniel Hahler
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
Robby Russell
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
Kaiwen Xu
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
Robby Russell
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
Robby Russell
9bd9278b80 Merge pull request #2287 from rumpelsepp/master
Added/modified some useful aliases.
2014-03-08 08:10:34 -08:00
Marc Cornellà
a951600b4e Avoid 'title:parse error' with single quotes in $CMD
Fixes #2182
2014-02-21 22:16:12 +01:00
Marc Cornellà
3e5de21dc5 Revert previous commit, escape % 2014-02-21 22:16:12 +01:00
Marc Cornellà
b73ced397f Use single quotes also in $LINE definiton 2014-02-21 22:16:12 +01:00
Marc Cornellà
b0fbe0d11a Avoid evaluating special chars in $LINE on title command (fixes #2234) 2014-02-21 22:16:12 +01:00
Huang, Tao
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
LFDM
b0b79e0aba No need to eval in rvm_prompt_info!
Just activate word-splitting.
2014-01-07 19:08:20 +01:00
LFDM
85fde31991 Renames the file to prompt_info_functions.zsh 2014-01-06 09:58:40 +01:00
LFDM
082607c165 Adds documentation. 2014-01-06 09:57:23 +01:00
LFDM
72392a2c27 Adds all other dummy implementations. 2014-01-06 09:57:09 +01:00
LFDM
6a40557a8b Updates spectrum.zsh 2013-12-31 14:54:34 +01:00
LFDM
c6aacf611d Refactors ruby_prompts.zsh 2013-12-31 02:45:09 +01:00
LFDM
8a887c5052 Joins ruby prompt files and adds ruby_prompt_info. 2013-12-31 02:11:02 +01:00
LFDM
7aa766168c Adds chruby_prompt_info dummy function. 2013-12-31 01:44:51 +01:00
LFDM
ae6ded5ad7 Returns false when rbenv is not found. 2013-12-31 01:15:35 +01:00
LFDM
468b24a8d5 Returns false when rvm is not found. 2013-12-31 01:06:14 +01:00
LFDM
bbbff94cca Fixes rvm_prompt_info() in lib/rvm.zsh 2013-12-31 00:35:57 +01: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
f0a7adcd3d Merge pull request #2176 from dejanlukan/spectrum
Added the spectrum_bls function, which prints all 256 colors set as the background.
2013-12-03 00:18:17 -08:00