Commit graph

94 commits

Author SHA1 Message Date
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
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
Gaetan Semet
d452490489 Merge https://github.com/robbyrussell/oh-my-zsh/pull/1961
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-07-15 11:53:27 +02: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
Gaetan Semet
781364a35a Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/theme-and-appearance.zsh
	plugins/tmux/tmux.plugin.zsh
2013-06-05 11:10:38 +02:00
Gaetan Semet
b60696e88d gmt as an alias for git merge tool --no-prompt 2013-06-05 11:03:09 +02:00
Ayush Samantroy
6f8e8c58a0 Added alias for git clean 2013-06-01 18:02:38 +05:30
Kirill Panshin
a22518fd9a Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2013-05-09 15:02:26 +07:00
Hervé Cauwelier
cd59e6c2b7 plugins/git: missing compdefs and new aliases 2013-05-05 12:41:55 +02:00
Robby Russell
f44d403572 Resolving conflict with merge of #1058 2013-04-23 21:20:00 -07:00
Robby Russell
b4578be3f1 Merge pull request #818 from jmacdonald/master
Alias for 'git diff'
2013-04-23 20:48:36 -07:00
Kirill Panshin
e2091b282b Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2013-04-10 08:39:30 +07:00
Gaetan Semet
b964433381 Merge branch 'master' of https://github.com/Stibbons/oh-my-zsh
Conflicts:
	README.textile
	custom/plugins/launch_trial/_launch_trial.sh
	plugins/encode64/encode64.plugin.zsh
	plugins/git/git.plugin.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
	tools/install.sh

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-03-27 16:51:05 +01:00
Gaetan Semet
1c1ab1eaec updating scripts 2013-03-27 10:15:10 +01:00
Gaetan Semet
15c510bbef gg and gga are now aliases dedicated to commit and only commit (and respectively amend commit) 2013-03-27 10:11:53 +01:00
Gaetan Semet
f114375030 updated 'gk' alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-03-27 10:11:53 +01:00
ChaYoung You
24f137e2d1 Add aliases 'grb*' for git-rebase
(cherry picked from commit 2d3c7f0a81)
2013-03-27 10:11:53 +01:00
Gaetan Semet
355c5fa8dd added README.md into git plugin 2013-03-27 10:11:53 +01:00
Gaetan Semet
0c6aec4b3d created _git-branch completion script to support git branch 2013-03-27 10:11:15 +01:00
Gaetan Semet
358a72a88b New aliases :gg and gk 2013-03-27 10:11:15 +01:00
Ben Marshall-Corser
f7f487c426 Alias for commit and commit all with amend
For the lazy and forgetful. Don't worry, a bang is fine in an alias and completion.

🎉
2013-03-17 23:00:12 +00:00
Gaetan Semet
6817a553a6 gg and gga are now aliases dedicated to commit and only commit (and respectively amend commit) 2013-02-28 14:59:59 +01:00
Gaetan Semet
7536aa0e5a Merge branch 'master' of https://github.com/Stibbons/oh-my-zsh 2013-02-25 14:50:51 +01:00
Gaetan Semet
2b8d4782f6 updated 'gk' alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-02-25 14:49:08 +01:00
ChaYoung You
3700a46f66 Add aliases 'grb*' for git-rebase
(cherry picked from commit 2d3c7f0a81)
2013-02-23 13:17:38 +01:00
Gaetan Semet
e49bdb3936 added README.md into git plugin 2013-02-15 00:18:52 +01:00
Gaetan Semet
c3f1d5a3e4 created _git-branch completion script to support git branch 2013-02-14 15:40:30 +01:00
Gaetan Semet
0c9deec62b New aliases :gg and gk 2013-02-14 15:39:05 +01:00
Gaetan SEMET
f84b2eddeb Creating new completion scheme for buildbot and repo tools 2013-02-12 14:50:46 +01:00
Kirill Panshin
3c9e351af4 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Conflicts:
	plugins/git/git.plugin.zsh
2012-12-18 13:15:12 +07:00
Robby Russell
083da66c0b Merge pull request #1139 from mappleconfusers/pull_req_git
Add aliases for git-remote
2012-12-05 07:16:36 -08:00