Commit graph

177 commits

Author SHA1 Message Date
Gaetan Semet
9a63084e20 Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
2015-08-10 16:15:53 +02:00
ncanceill
d24196cfbd git plugin: fix ggl to avoid empty string
see
https://github.com/robbyrussell/oh-my-zsh/pull/2790#issuecomment-112716330
2015-06-17 22:38:31 +02:00
Arnaud Rinquin
ed6645a282 Fix plugin/git ggpull and ggpush backward compatibility
Current `ggpush` is `git push origin` instead of `git push origin $(current_branch)`
Same for `ggpull`
2015-06-17 22:36:25 +02:00
ncanceill
f1a43daa36 git plugin: new/changed aliases
gaa was brought back by popular demand — see #3535
gap was replaced with gapa — see #3682
gdc was replaced with gdca — see #3977
2015-06-12 11:50:30 +02:00
ncanceill
8eb31a6f9a git plugin: fix ggpnp when called without argument
also allow multiple arguments for ggp and ggl aliases
2015-06-11 23:34:18 +02:00
ncanceill
f513999a4d git plugin: make b local in gg* functions
because it leaked, and led to #3991
2015-06-11 17:14:35 +02:00
ncanceill
6ff96dab36 git plugin: fix error msg in gwip alias
because git rm will fail when no files were deleted
2015-06-11 16:16:12 +02:00
ncanceill
6c29041af7 git plugin: global var for git command
due to issues like #3962
until a proper plugin-loading system is implemented
2015-06-11 15:12:28 +02:00
ncanceill
a570f4b7f3 git plugin: bring back olg gg aliases
by popular demand, see #3972
2015-06-11 11:04:54 +02:00
ncanceill
5b75cc7880 Many updates to git plugin (see #2790) 2015-05-08 16:00:22 +02:00
Gaetan Semet
fdbecb80e3 Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	themes/ys.zsh-theme
2015-04-22 18:22:55 +02:00
Robby Russell
43531625ab Merge pull request #2407 from mgalgs/gmt-compdef
Fix gmt compdef
2015-02-22 10:24:39 -08:00
Tejas Bubane
8cb97d6f22 Add alias for git add --all 2015-02-04 12:24:17 +05:30
Robby Russell
8ca39dec74 Revert "Exit early from git plugin if not in git repo." 2014-09-18 15:59:47 +02:00
Anton Eicher
d590990ca9 Added check for .git directory in current, before wasting time querying git. This saves seconds on my pc. 2014-09-18 15:54:13 +02:00
Robby Russell
bd478d942f Revert "Exit early from git plugin if not in git repo." 2014-09-17 14:15:19 +02:00
AJ Henriques
055274da2c add git difftool alias (gdt) 2014-09-17 14:15:18 +02:00
DariusPHP
13764a7cd1 #git plugin git diff-tree --name-only added 2014-09-17 14:15:17 +02:00
lundberg
0344721f20 New alias for git plugin: gbr == git branch --remote 2014-09-17 14:15:17 +02:00
Bruno Oliveira
be0cffd57d Inclusion of aliases for sign git commits and tags 2014-09-17 14:15:17 +02:00
Jim Remsik
cb8c1320db Add gap (git add --patch) 2014-09-17 14:14:44 +02:00
Anton Eicher
e5977cd8f6 Added check for .git directory in current, before wasting time querying git. This saves seconds on my pc. 2014-09-17 14:14:43 +02:00
Robby Russell
5e25913178 Revert "Exit early from git plugin if not in git repo." 2014-09-04 12:53:43 +02:00
AJ Henriques
f0d5cfdc33 add git difftool alias (gdt) 2014-08-31 20:30:42 -07:00
Robby Russell
99fde07b8f Merge pull request #3000 from bigtiger/add-git-add-patch
Add gap (git add --patch)
2014-08-31 12:10:04 -07:00
Robby Russell
58491bda21 Merge pull request #3012 from abstractj/git-gpg-signatures
Inclusion of aliases for sign git commits and tags
2014-08-31 11:44:57 -07:00
Robby Russell
74e7510a7d Merge pull request #3014 from allister-lundberg/git_alias_gitbranchremote
New alias for git plugin: gbr == git branch --remote
2014-08-31 11:43:59 -07:00
Robby Russell
c07bf981c3 Merge pull request #1504 from jediant/master
Exit early from git plugin if not in git repo.
2014-08-31 10:59:55 -07:00
DariusPHP
5d6c73d7d3 #git plugin git diff-tree --name-only added 2014-08-22 10:21:38 +03:00
lundberg
9a0196dbf7 New alias for git plugin: gbr == git branch --remote 2014-08-10 12:01:47 -07:00
Bruno Oliveira
45abe764e5 Inclusion of aliases for sign git commits and tags 2014-08-09 12:26:35 -03:00
Jim Remsik
4f1ee6c1ee Add gap (git add --patch) 2014-08-01 20:16:33 -05:00
Mitchel Humpherys
33ef34baa5 Fix gmt compdef
Fix typo: gm -> gmt
2014-04-29 10:20:39 -07:00
Gaetan Semet
5afa441d66 Merge remote-tracking branch 'upstream/master'
Conflicts:
	templates/zshrc.zsh-template
2014-03-24 11:54:41 +01:00
Benoit Dubertret
a869ec9bc8 Fix gwip alias in git plugin when no files to rm 2014-03-17 16:07:46 +01:00
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
Gaetan Semet
e135ddfb1d reworked git plugin alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-03-12 12:11:53 +01:00
Emanuele Zattin
f6f3e93019 Improve oneline logs
Add decorate and color to the normal oneline and add a new alias for graph oneline logs.
2014-02-13 10:32:52 +01:00
Gaetan Semet
571f0838d7 restored official git plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-03 14:26:14 +01:00
Gaetan Semet
c38877c19b backslash gitk aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-03 14:09:01 +01:00
Gaetan Semet
1279533359 fix gclean (*.BASE.*)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-01-30 15:44:09 +01:00
Gaetan Semet
43da92c071 Merge remote-tracking branch 'upstream/master' 2014-01-18 12:09:59 +01:00
Sam O
d60522c7a2 escape dashes 2014-01-02 15:53:34 -08:00
Sam O
827d9dfcb4 Update git.plugin.zsh 2014-01-02 15:48:09 -08:00
Gaetan Semet
6604587f5b doc in git plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-12 12:52:04 +01:00
Gaetan Semet
afc63fd398 git plugin: new alias for gfa + gpr
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-11 16:01:34 +01:00
Gaetan Semet
e80764134a git plugin: git rewrite history aliases + fix gclean
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-11 15:59:56 +01:00
Gaetan Semet
4470dc59ec Fix in git plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-09 11:19:06 +01:00
Gaetan Semet
5c71237045 add gitclean alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-03 18:05:46 +01:00
Gaetan Semet
4fb40a1f04 fix git checkout master
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-03 10:25:32 +01:00