Commit graph

301 commits

Author SHA1 Message Date
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
Robby Russell
552aab6939 Merge pull request #2591 from kevinxucs/remove-extra-aliases
Removed unsolicited aliases.
2014-03-13 13:29:12 -07: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
Gaetan Semet
e984e9a52c Merge remote-tracking branch 'styx/styx/git_command_prompt_fix' 2014-02-24 15:06:24 +01:00
Mikhail S. Pobolovets
77781d2efe Add missing command wrapper for git
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2014-02-24 14:46:37 +03: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
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
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
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
Gaetan Semet
e7dbded054 Merge remote-tracking branch 'upstream/master' 2013-12-09 10:52:48 +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
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
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
Robby Russell
1dd9c43e12 Merge pull request #1134 from koraa/pull_req_helpers
Helpers for default variables and alias value access
2013-12-02 23:47:21 -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
Robby Russell
273728901e Merge pull request #513 from randy909/fix-edit-cmdline
Fix edit-command-line binding
2013-12-02 23:03:03 -08:00
Robby Russell
fb614a0e80 Merge pull request #2229 from prubianes/master
Bazaar Integration Lib
2013-12-02 22:37:28 -08:00
Robby Russell
9357f2f41d Merge pull request #2236 from Isquariel/nvm
Added function to show current Node.js version and new Bureau theme
2013-12-02 22:35:41 -08:00
Robby Russell
ac838345f5 Merge pull request #2270 from michaelorr/slow-git-fix
Optionally disable git_prompt_info with git config option for very large repos
2013-12-02 22:28:11 -08:00
Gaetan Semet
6a58e4c8e9 Merge remote-tracking branch 'upstream/master' 2013-12-02 15:20:36 +01:00
Stefan Tatschner
c9f2c947e4 Added/modified some useful aliases. 2013-11-29 14:25:46 +01:00
Michael Orr
fbd479b68e adding a check for git config option to disable git_prompt_info() on a per repo basis 2013-11-20 12:30:55 -05: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
Petter Abrahamsson
a7540844d5 Add support for colored ls output on OpenBSD 2013-11-14 07:06:54 -05:00
Carlos Cardoso
422a4224fb customzing defaults. 2013-11-13 00:31:10 -02:00
isquariel
5c73cb671b Added nvm.zsh to detect current Node.js version 2013-11-08 23:26:05 +04:00
Pablo Rubianes
efc37c1f71 Modification to the frisk theme to work with the BZR lib 2013-11-06 20:10:59 -02:00
dejan
f057737e57 Added the spectrum_bls function, which prints all 256 colors set as the
background.

We can easily see which color we want to set when changing the PS1 shell variable,
since the colors are more distinctive.
2013-10-16 12:36:48 +02:00
Benjamin Chrétien
c638f9d7fd Get number of lines changed for Git 2013-07-17 10:06:24 +02:00
Carlos Cardoso
b5205c12d4 Merge remote-tracking branch 'upstream/master'
* upstream/master: (41 commits)
  fixed typo in tmux plugin
  Update coffee completion
  The current version of bower is completely unavailable, plugin depth modification
  rvm plugin: update to ruby version helpers and rvm-update
  Change duplicated alias name
  Add autocompletion for Rails3.
  Add more capable hg incoming and outgoing count handling
  Add celery completion
  add virtualenv prompt support for agnoster theme
  git-pull add --rebase option
  Typo
  Prevent starting multiple gpg-agents
  Not loading home tmux confs when iTerm2 tmux integration is enabled
  Adding support for iTerm2 tmux integration via option '-CC'
  remove unused function
  autocomplete required packages as second argumet
  debian plugin: ignore alias in sudo/aptitude check
  Add new plugin for homebrew installed version of postgres
  Do not clear tab when calling it with an argument.
  Correctly detect Rapid Board
  ...
2013-07-12 14:26:59 -03: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
e646ee6caa Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/repo/repo.plugin.zsh
2013-06-26 17:24:11 +02:00
Robby Russell
4f8d6a8b15 Merge pull request #1773 from essembeh/master
Uncomment l alias
2013-06-25 09:10:05 -07:00
Gaetan Semet
b77ccd7c8f Merge remote-tracking branch 'upstream/master' 2013-06-25 15:39:23 +02:00
Robby Russell
0f2b24c1b8 Merge pull request #1887 from tgkokk/git-slow-fix
Fixed slow behavior when using GitHub wrappers
2013-06-21 07:07:26 -07:00
Gaetan Semet
31f1e2202a Merge remote-tracking branch 'upstream/master' 2013-06-18 11:54:16 +02:00