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
2,576 commits 3 branches 0 tags 156 MiB
Commit graph

2,576 commits

This branch
This branch
All branches
Author SHA1 Message Date
Esteban Sánchez
e2595c5ff5 Avoid showing 'git rm' usage when using gwip alias 2014-06-08 10:30:15 +02:00
Yachi Lo
b167029a28 bring back git ls-files|grep $1 as a function, and add completion 2014-06-02 15:37:48 +02:00
ncanceill
10e88bd791 add gbnm alias for non-merged branches 
inspired from #1982
 2014-06-02 15:37:48 +02:00
ncanceill
41b181ff37 add aliases from #2494 2014-06-02 15:37:48 +02:00
ncanceill
378a99f25b change alias gwc to gwch, fixes #2463 2014-06-02 15:37:48 +02:00
ncanceill
f93ee152a4 improve readme to abide by #2640 2014-06-02 15:37:48 +02:00
ncanceill
be8e85b71c update aliases to default to current branch, fixes #1601 2014-06-02 15:37:47 +02:00
ncanceill
c0868ea1c0 re-organized plugin (no real change) 2014-06-02 15:37:47 +02:00
thuai
54abcf6c84 add alias for 'git stash list' 2014-05-17 14:11:18 +08:00
Mitchel Humpherys
a55412801c Fix gmt compdef 
Fix typo: gm -> gmt
 2014-05-14 22:21:59 +02:00
Hervé Cauwelier
9224918c3c plugins/git: missing compdefs, fix bad copy-paste 
Original author :     Hervé Cauwelier <herve.cauwelier@polyconseil.fr>
Merged & cleaned by:  ncanceill <https://github.com/ncanceill>
 2014-05-07 17:01:21 +02:00
ncanceill
a6c6bce3bd fix gwip alias for some BSD flavors, fixes #2692 2014-05-07 16:52:24 +02:00
Marten Lienen
00072a8831 Add aliases for git rebase and git rebase skip 
Original author :     Marten Lienen <marten.lienen@gmail.com>
Merged & cleaned by:  ncanceill <https://github.com/ncanceill>
 2014-05-07 16:46:32 +02:00
Kirill Panshin
588943ea57 Additional commands to git plugin 
Original author :     Kirill Panshin <kipanshi@gmail.com>
Merged & cleaned by:  ncanceill <https://github.com/ncanceill>
 2014-05-07 16:39:46 +02:00
Maxime Fabre
e3d8d7bebe Add submodule helpers to Git plugin 
From #1116

Modified: compdef needs _git entry point
Modifier: ncanceill <https://github.com/ncanceill>

Original commit:
Author :     Maxime Fabre <ehtnam6@gmail.com>

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6e6ba05..53046de 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -161,4 +161,10 @@ alias gunignore='git update-index --no-assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'

-
+# Submodules
+alias gf='git fetch'
+compdef _git gf=git-fetch
+alias gsi='git submodule init'
+compdef gsi=git-submodule
+alias gsu='git submodule update'
+compdef gsu=git-submodule
 2014-05-07 16:27:42 +02:00
Anton Eicher
7f5f8c36f5 Added check for .git directory in current, before wasting time querying git. This saves seconds on my pc. 2014-05-07 16:18:39 +02:00
Robby Russell
eafd5f3252 Merge pull request #1635 from jimhester/per-directory-history 
Update to latest per-directory-history
 2014-04-19 12:56:21 -07:00
Robby Russell
11bf1a3a29 Merge pull request #2681 from mcornella/fix-zsh_reload-plugin 
Various fixes on zsh_reload plugin
 2014-04-19 12:55:56 -07:00
Robby Russell
4509228c53 Merge pull request #2728 from benwong/patch-2 
Spelling correction in itunes control function.
 2014-04-19 12:55:30 -07:00
Robby Russell
59de9aaa65 Merge pull request #2671 from ukrutt/master 
Correct redirection of stderr
 2014-04-19 12:55:09 -07: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
5eb5f7138a Merge pull request #2511 from FloFra/master 
Makes history-substring-search use term specific up and down buttons.
 2014-04-19 12:54:10 -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
Robby Russell
ee31abfb2d Merge pull request #2729 from grodzik/master 
Fix for Python3
 2014-04-19 07:15:04 -07:00
Robby Russell
3b830aac8c Merge pull request #2693 from javiertejero/master 
Fix `docker rmi` tab completion
 2014-04-19 07:14:39 -07:00
Javier Tejero
7949a1cd8d Fix docker rmi tab completion 
This is exactly what happens on tab completion for docker rmi. This commit
fixes that.

```sh
$ docker rmi <hit TAB>
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
```
 2014-04-19 09:03:28 +02:00
Paweł Tomak
cee52283d8 Fix for Python3 
In Python3 without universal_newlines set to True
output from Popen was byte-encoded.
 2014-04-18 23:09:38 +02:00
Dmitriy
9385b3ee0a set exclude-dir or exclude grep flags only if available 2014-04-19 00:03:36 +04:00
Marc Cornellà
fcfa323974 Use cache folder inside $ZSH, delete with unaliased rm 2014-04-18 17:07:23 +02:00
Benjamin Wong
6f3cf195c6 Spelling correction in itunes control function. 
Spelling correction in itunes control function.
 2014-04-18 22:43:23 +10:00
Robby Russell
a9061f34d7 Merge pull request #2633 from redsunsoft/agnoster-theme-git-mode-addition 
Added git support for merging, rebasing, and bisecting to agnoster theme
 2014-04-17 19:57:23 -07:00
Robby Russell
f8f01262ab Merge pull request #2685 from delynn/patch-2 
Remove mailcatcher from bundler plugin
 2014-04-05 08:01:29 -07:00
DeLynn Berry
7d696f79b8 Remove mailcatcher 
The mailcatcher gem does not work correctly when executed through Bundler.
 2014-04-04 08:11:11 -06:00
Robby Russell
00d6ef8a31 Merge pull request #2329 from pstadler/brew-cask 
add brew-cask plugin
 2014-03-31 07:57:25 -07:00
Henrik Holm
f46d06dae1 Correct redirection of output from 'hash' 
The intention of the redirection to /dev/null is to hide the output
'hash: no such command: git' since we rely on the exit status.

However, the output goes to stderr, so it's stderr that needs to be
redirected. For completeness, we redirect both stderr and stdout using
'2>&1'.

Example:

  [~]$ hash git > /dev/null
  [~]$ PATH=''
  [~]$ hash git > /dev/null
  hash: no such command: git
  [~]$ hash git > /dev/null 2>&1
  [~]$
 2014-03-30 10:34:13 -04:00
Robby Russell
70dfb91b98 Merge pull request #2663 from bobmaerten/docker-autocomplete-updates 
Docker autocomplete plugin is not up to date with recent versions.
 2014-03-27 21:33:49 -07:00
Robby Russell
fe73f8d5b1 Merge pull request #2651 from jehrhardt/fix-emacs 
Fix Emacs plugin
 2014-03-27 21:32:58 -07: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
Robby Russell
ae0c6507e4 Merge pull request #2659 from simonc/allowing-pow-path-with-spaces 
Allowing path with spaces in pow plugin
 2014-03-27 21:30:38 -07:00
Robby Russell
861d380aa3 Merge pull request #2658 from leifcr/rake-fast-issue 
Plugin: Rake-fast: Support both *nix and Darwin
 2014-03-27 21:29:36 -07:00
Robby Russell
27c28a94af Merge pull request #2647 from bobwilliams/master 
Adding a README.md for plugins/jsontools
 2014-03-27 21:22:03 -07:00
Robby Russell
78967b604d Merge pull request #2656 from philenotfound/master 
New aliases for 'apt-get' and 'aptitude' as they were overwritten by lat...
 2014-03-27 21:21:24 -07:00
Robby Russell
a6b9597373 Merge pull request #2652 from lukehorvat/patch-1 
Fixed typos + made wording more consistent in zshrc.zsh-template
 2014-03-27 21:19:42 -07:00
Robby Russell
a5f6f72b66 Merge pull request #2660 from KevinBongart/add-readme-to-rake-fast 
Add README file to rake-fast plugin
 2014-03-27 21:18:28 -07:00
Robby Russell
9c1241a680 Merge pull request #2662 from aeriksson/master 
Fix broken reverse-menu-complete keybinding.
 2014-03-27 21:18:02 -07:00
Bob Williams
400643ff5b adding urldecode_json to compliment urlencode_json and updating readme.md; slight tweak to urlencode_json from previous commit 2014-03-27 10:34:54 -04:00
Bob Williams
0605d53fa7 adding urlencode_json and associated README.md details 2014-03-26 18:47:57 -04:00
tcasparro
53323abdb1 Added git mode support for merging, rebasing, and bisecting 
<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing
 2014-03-26 10:37:56 -07:00
Bob Maerten
76e1edf31f Matching autocomplete for Docker v0.9.1 
Many deprecations since 0.8 and new commands.
 2014-03-26 10:40:46 +01: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