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

114 commits

Author SHA1 Message Date
Gaetan Semet
4fb40a1f04 fix git checkout master 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-03 10:25:32 +01:00
Gaetan Semet
7499bbbf04 reorganised git plugin 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-12-03 09:49:51 +01: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
4e34588a5b Merge pull request #2208 from onemouth/master 
Update git.plugin.zsh
 2013-12-03 00:20:36 -08:00
Robby Russell
b6f4a887ac Merge pull request #2131 from stevschmid/patch-1 
Fix gallois theme
 2013-12-02 23:24:01 -08:00
onemouth
c81e42f050 Update git.plugin.zsh 
add command to ignore changes to file temporarily
 2013-10-30 11:05:35 +08:00
Gaetan Semet
62e40902ff Merge remote-tracking branch 'upstream/master' 
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
 2013-10-25 16:03:23 +02:00
Robby Russell
86d57e83ed Merge pull request #2078 from tbuehl/master 
Add commonly used git stash aliases to git plugin
 2013-10-24 20:24:59 -07:00
Gaetan Semet
a394bfe8ee Reworked Git aliases 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-10-16 15:06:59 +02:00
Hervé Cauwelier
9d4a9be541 plugins/git: missing compdefs and new aliases 2013-10-07 15:26:14 +02:00
Steven Schmid
05b3ea342a Fix work_in_progress in empty git repos 
I noticed that the function ``work_in_progress``, which is used in the "gallois"-theme, would print ``fatal: bad default revision 'HEAD'`` in a new folder after ``git init``.

This is the fix.
 2013-10-01 18:08:15 +02:00
Gaetan Semet
bd32698531 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	templates/zshrc.zsh-template
 2013-09-24 14:30:27 +02:00
Robby Russell
26e936e645 Merge pull request #1967 from tchaudhri/gdc_git_alias 
Added a 'git diff --cached' alias -> 'gdc'
 2013-09-19 06:56:58 -07:00
Robby Russell
a712579a2a Merge pull request #2099 from mchaisse/master 
Added WIP (work in progress) feature to git.plugin
 2013-09-18 23:38:11 -07:00
Maxime Chaisse-Leal
095a01d92a Added WIP (work in progress) feature to git.plugin 2013-09-18 21:54:23 +02:00
Gaetan Semet
33e9308703 gf is not git fetch, not git ls (=> gls) 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-09-11 15:28:23 +02:00
Gaetan Semet
0d4892d4db new git stash aliases 
Inspired by https://github.com/robbyrussell/oh-my-zsh/pull/2078/files

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-09-10 11:41:55 +02:00
Gaetan Semet
84b738e31c Merge branch 'gsemet_push_git_plugin' 
Conflicts:
	plugins/git/git.plugin.zsh
 2013-09-10 11:26:30 +02:00
Gaetan Semet
00f52bcc1b Minor changes in Git aliases 
- change gr to git remote to git rebase. In a daily developement,
  for a typical developper, ther is more rebase than adding or
  removing branches. Thus, gr (for git remote) becomes gre, while
  gr becomes git rebase (gr = rebase, gra = abort rebase,
  grc = rebase continue)
- gf is for git fetch. new alias for --all: gfa
- gitk-entier-history is a magic alias for find lost/dandling
  commits without having to mess with git reflog

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-09-10 11:15:53 +02:00
Torsten Bühl
5bf20572cc Add commonly used git stash aliases 2013-09-05 14:37:37 +02:00
yleo77
fda5afaebc Merge remote-tracking branch 'robbyrussell/master' 2013-08-29 13:41:42 +08:00
Gaetan Semet
82a886184b New alias in git plugin 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-08-28 10:41:17 +02:00
Gaetan Semet
20713e352a Removed duplicated line 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-08-13 15:27:25 +02:00
Gaetan Semet
2c42c45a7e Merge remote-tracking branch 'upstream/master' 2013-08-13 15:24:39 +02:00
Robby Russell
39a5e36c37 Merge pull request #1790 from simlegate/master 
change git  alias
 2013-08-13 06:20:53 -07:00
Gaetan Semet
5178757f8f Merge remote-tracking branch 'bors-ltd/master' 
Conflicts:
	plugins/git/git.plugin.zsh
 2013-07-30 16:16:38 +02:00
Hervé Cauwelier
ecc0b900b6 plugins/git: missing compdefs and new aliases 2013-07-29 09:58:32 +02:00
yleo77
6041e4938c set default value --max-count=10 2013-07-16 16:54:54 +08:00
yleo77
67b2781f62 Merge remote-tracking branch 'robbyrussell/master' 2013-07-16 16:37:18 +08:00
Gaetan Semet
4f70c3670a Merge branch 'stibbons_fix_git_aliases' 
Conflicts:
	plugins/git/git.plugin.zsh
 2013-07-15 15:13:45 +02:00
Gaetan Semet
5c103b5675 Fix aliases for git and repo 
This also adds the wonderful "gitk-entier-history" alias
to display the entiere git history with dangling commits.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-07-15 15:08:57 +02:00
Gaetan Semet
8e86d871e3 Add and fix git aliases 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-07-15 12:00:57 +02:00
Tehmasp Chaudhri
57a2327ddf Added a 'git diff --cached' alias -> 'gdc' 2013-07-12 12:03:44 -06:00
Gaetan Semet
c7d4c417f9 Merge remote-tracking branch 'bors-ltd/master' 
Conflicts:
	plugins/git/git.plugin.zsh
 2013-07-05 16:12:56 +02:00
Hervé Cauwelier
2303ad0652 plugins/git: missing compdefs and new aliases 2013-07-02 09:51:32 +02:00
Gaetan Semet
f7b2afc1b7 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	plugins/git/git.plugin.zsh
 2013-07-01 11:01:16 +02:00
Okura Masafumi
c51ef9dce6 Change duplicated alias name 2013-06-27 22:28:14 +09: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
b9baf37739 Merge pull request #1859 from ayushs/plugin-git-clean 
Added alias for git clean
 2013-06-25 09:26:00 -07:00
Robby Russell
a8c0c4de06 Merge pull request #1864 from Stibbons/gsemet_push_git_plugin 
Improvement in the git plugin
 2013-06-25 09:25:38 -07:00
Gaetan Semet
e6fc584464 compdef for git plugin 2013-06-18 11:49:55 +02:00
Gaetan Semet
95310800ff Merge remote-tracking branch 'kipanshi/master' (git alias) 
Conflicts:
	plugins/git/git.plugin.zsh
 2013-06-18 11:47:28 +02:00
Gaetan Semet
91dc73d411 Renamed alias gf to gls (git-ls) 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-06-18 11:41:17 +02:00
Gaetan Semet
175bab45ef Merge remote-tracking branch 'bors-ltd/master' (git alias) 
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
	tools/upgrade.sh
 2013-06-18 11:26:55 +02:00
Gaetan Semet
4ca1f0fd8b New aliases for git 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-06-12 15:46:41 +02:00
Gaetan Semet
de518e4242 Update Git aliases 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-06-11 14:49:50 +02:00
Gaetan Semet
ddf9b8be15 new git alias : gfa 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-06-11 11:34:40 +02:00
Michiel Missotten
d6945e2daa Adding a rebase option to git alias. 2013-06-11 11:23:02 +02:00
Gaetan Semet
521f9e78b6 New git alias : gitk-entier-history 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-06-10 11:40:36 +02:00
Gaetan Semet
46f0d8dba9 Improvement in the git plugin 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-06-05 15:16:51 +02:00