linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7305 commits 1 branch 0 tags 138 MiB
Commit graph

245 commits

Author SHA1 Message Date
Nikolas Garofil
adef0e6081
feat(git): run gitk in the background in gk and gke aliases (#9657) 2021-10-04 10:43:13 +02:00
Claas Augner
130f35fcb2
feat(git): add gdu alias to diff against upstream (#8721) 2021-09-09 19:16:15 +02:00
Marc Cornellà
5a4159cd29
fix(git)!: rename git mergetool aliases to gmtl* (#9154) 
BREAKING CHANGE: the `gmt` alias conflicts with the Generic Mapping Tools command.
For that, the `gmt` alias has been renamed to `gmtl`, and `gmtvim` has been renamed to
`gmtlvim` for consistency.

Fixes #9154
 2021-09-06 13:31:13 +02:00
Neil Girdhar
a5850d441b
feat(git): change from commiter to author in git log aliases (#9670) 2021-09-06 11:21:44 +02:00
Vitaly Polonetsky
53b54f5faa
feat(git): guess main branch name also from remotes (#10158) 
Co-authored-by: Marc Cornellà <hello@mcornella.com>
 2021-09-03 11:43:53 +02:00
wl2776
0c590aba74
fix(git): fix gbda alias when there are no merged branches (#10005) 2021-08-27 18:07:19 +02:00
Max Eisner
ab58594173
feat(git): add develop branch name detection (#9881) 2021-08-10 16:31:49 +02:00
Nick Revin
08751210e3
feat(git): Add aliases for 'git commit -S -s [-m]' (#7616) 
I thought it would be useful to add these aliases. 

There are already aliases for `git commit -S` and `git commit -s` but there is none for both simultaneously =)
 2021-06-13 10:59:31 -07:00
Lasse Peters
3ea66642e8
feat(git): Add alias for 'git checkout --recurse-submodules' (#9958) 2021-06-13 10:25:27 -07:00
Daniel Wu
9bdbe08aa2
feat(plugins): add gpr alias for /git pull -rebase/ which is easier to remember (#9964) 2021-06-12 06:06:09 -07:00
Babak K. Shandiz
d646884add
feat(git): add aliases gcas and gcasm for commit with sign-off (#8881) 2021-05-03 17:35:13 +02:00
Marc Cornellà
2b1d412279
fix(git): add push or save to gstu alias (#9766) 
Fixes #9766
 2021-03-31 11:25:26 +02:00
John Delgado
040aadf7c4
feat(git): add grbo alias for git rebase --onto (#8088) 2021-03-15 20:06:01 +01:00
Peter Babič
0f6aa0182c feat(git): add grst alias for git restore --staged (#8932) 
Closes #8932
 2021-01-01 18:23:42 +01:00
Joseph Heyburn
e2f2489a66
fix(git): silently fail in git_main_branch if not in a git repo (#9484) 
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
 2020-12-08 18:25:42 +01:00
Alisson B. Santos
51772732f5
feat(git): support trunk branches in git_main_branch (#9417) 2020-11-12 16:17:28 +01:00
Marc Cornellà
c549387745 git: fix version check 2020-10-04 13:09:32 +02:00
Fabian Bonk
d81b4ac9f2
git: run gfa with --jobs=10 (fetch remotes in parallel) (#9268) 
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
 2020-10-03 20:29:26 +02:00
Marc Cornellà
c99f3c50fa git: go back to previous main branch detection logic 
Fixes #9114
 2020-07-15 17:02:49 +02:00
Marc Cornellà
83f6194929 git: change docs for git_main_branch 
Also remove unnecesary dramatic remark
 2020-07-11 20:18:05 +02:00
Marc Cornellà
55a98fc06d git: better algorithm to decide what's the main branch 
Fixes #9103

Co-authored-by: Yufan You <ouuansteve@gmail.com>
 2020-07-11 20:02:06 +02:00
Marc Cornellà
1db79f97f5 git: use master if it exists, otherwise use main 
See https://github.com/ohmyzsh/ohmyzsh/pull/9049#issuecomment-654537347

Co-authored-by: Yufan You <ouuansteve@gmail.com>
 2020-07-09 11:17:07 +02:00
Adam Vandover
3178334a2d
git: change main branch naming scheme (#9049) 
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
 2020-07-03 19:03:04 +02:00
Tvrtko Majstorović
255ef8d587
git: add alias for git diff excluding lock files (#8935) 2020-05-23 18:57:13 +02:00
larumbe
77b409d5c2
git: add convenience aliases for git apply and git am (#8563) 2020-05-22 16:56:03 +02:00
David
a25efd1e31
git: exclude devel branch from list in gbda alias (#8957) 2020-05-22 16:54:10 +02:00
Mikael Andersson Wigander
d8f674cc8e
git: exclude 'development' in gdba alias (#8902) 2020-05-21 18:13:14 +02:00
Jean-Yves Rivallan
831089a375
git: make the gpristine alias remove untracked git repos (#8697) 2020-03-03 14:06:40 +01:00
Ujwal Dhakal
e8609b857c
git: add grename to rename a local branch and in the origin remote (#8622) 
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
 2020-02-18 21:05:52 +01:00
Roman
aa4146a9a4
git: add alias for git stash --include-untracked (#8617) 2020-02-15 18:28:02 +01:00
Marc Cornellà
093b56a7d7
git: fix gtl alias argument 
Fixes the error `no matches found` because the argument is not quoted.
See https://github.com/robbyrussell/oh-my-zsh/pull/7629#issuecomment-531151821
 2019-09-13 11:20:20 +02:00
Ryan Styrczula
df9cf72396 plugins/git: Fix gbda trying to delete worktree branches 
Git learned to add a `+` in front of branches that are
checked out in other worktrees.

See: 745f681289/Documentation/RelNotes/2.23.0.txt (L252-L256)
 2019-08-23 11:08:20 -04:00
Julien Janvier
de3b14cf69 git: add aliases for git switch and restore (#8089) 2019-08-20 12:11:38 +02:00
SomeDer
f992d434ec git: add git revert alias (#7841) 
* git: add `alias grev="git revert"`

* Swapping double for single quotes

Matching the conventions in the plugin
 2019-06-15 10:47:23 -07:00
Marc Cornellà
4ad4a81657 git: clean up plugin file and delete current_repository function 
Closes #6329
 2019-05-21 11:04:01 +02:00
Marc Cornellà
7824dc637d
git: use is-at-least to test for git version 
Fixes #7754
 2019-04-10 11:47:29 +02:00
Marc Cornellà
b31106b341
git: minor syntax fix 2019-04-09 18:35:09 +02:00
Marc Cornellà
35dc26a2c0
git: use stash 'push' instead of the deprecated 'save' (#7486) 
* Use stash 'push' or 'save' depending on Git version

A utility function now parses the output of git --version and set the
alias for git stash to 'git stash push' iff the current version of Git
is 2.13 or greater; it falls back to 'git stash save' otherwise.
 2019-04-09 18:33:15 +02:00
Marc Cornellà
1bd72f588c
Update to inline conditional syntax 2019-04-09 18:29:18 +02:00
Asatur Meltonyan
046d49f782 git: add 'gtl' alias to list tags matching a pattern (#7629) 
1. List the tags that match the pattern(s) passed through the argument.
2. Displays the first line of the annotation message along with the tag, or the line of the first commit message if the tag is not annotated.
3. Sorts and displays tags in descending order.
 2019-04-07 14:17:22 +02:00
Marc Cornellà
831fba4ee4
Revert "git: delete branches in gbda only if there are any (#6079)" (#7724) 
This reverts commit 0e0789fb7a.
 2019-04-02 19:05:52 +02:00
Marc Cornellà
93cbc1614c
git: use interactive mode in gclean 
Fixes #7716
 2019-03-31 15:56:35 +02:00
Simen Bekkhus
4b82b86064 git: add --no-gpg-sign to gwip (#6031) 2019-03-29 22:59:37 +01:00
Jakub Chábek
0e0789fb7a git: delete branches in gbda only if there are any (#6079) 
It doesn't make sense to run `git branch -d $BRANCH` if the `$BRANCH` is empty.
 2019-03-29 22:56:59 +01:00
Marc Cornellà
f6a9a0a498
git: fix grt on path with spaces 
Fixes #7682
 2019-03-25 18:46:18 +01:00
Tieme van Veen
9509fd6a91 Add git reset to origin alias to git plugin (#7630) 2019-03-10 09:38:06 -07:00
Bartlomiej Tartanus
932d611c90 git: properly indent ggfl function (#7556) 
Fixes (probably MacOS) issue:
> ggfl
zsh: command not found: ggfl
 2019-01-30 16:22:14 +01:00
Gianluca Recchia
308b046875
Use stash 'push' or 'save' depending on Git version 
A utility function now parses the output of git --version and set the
alias for git stash to 'git stash push' iff the current version of Git
is greater than 2.13; it falls back to 'git stash save' otherwise.
 2019-01-29 04:11:02 +01:00
neeasade
3c16466a14 git: quote branch name in ggpull and ggpush (#7472) 2019-01-20 20:19:07 +01:00
Max Gautier
509a554900 git: use color auto for ref names in git log (#5729) 
Allow the ref names to have differents colors if they are remote refs
or local refs, and another color for HEAD
(use the same coloring scheme as --decorate option)
 2018-09-12 19:35:10 +02:00
Luis Ferrer-Labarca
5ee93f4f15 git: add git rm aliases (#5433) 
* grm for 'git rm'
* grmc for 'git rm --cached'
 2018-09-12 19:08:12 +02:00
Yago Nobre
0db7da0cd5 git: add push force aliases (#6297) 
* gpf to --force-with-lease
* gpf! to --force
 2018-09-12 19:05:57 +02:00
Simen Bekkhus
a3afeca3eb git: add gbD alias to force-delete branch (#5844) 2018-09-12 18:38:21 +02:00
Jefferson F. Pires
d5f0a0a413 git: add glols alias for glol --stat (#5871) 2018-09-12 16:57:48 +02:00
Gant Laborde
69ba6e4359 git: add alias to git stash --all (#5511) 
Stash tracked, ignored and untracked files. Leaves the working directory absolutely clean.
 2018-09-12 16:28:59 +02:00
Poyoman
3d2542f41b git: add pull rebase --autostash aliases (#6791) 2018-09-12 15:52:42 +02:00
Kris Kalavantavanich
e93378aacd [plugins/git] Updated git clone alias (#6893) 
* Updated git clone alias

`git clone --recursive` has been deprecated in favor of `--recurse-submodules`.  
See: https://stackoverflow.com/questions/3796927
 2018-08-29 15:18:20 +02:00
Joel Wallis Jucá
652356b9b9 git: add the git show alias gsh (#5591) 2018-08-23 22:04:42 +02:00
Peter Bittner
035d78120c Add Git alias for git diff --staged (#7064) 2018-08-15 19:44:06 +02:00
Tushar Tiwari
1691cf8a99 Add alias for git add --verbose (#3167) 
Add alias `gav='git add -v'`
fixes #6793
 2018-08-13 21:11:25 +02:00
Michal Juriš
b6ca933a02 Add alias for 'git rebase develop' (#6006) 2018-06-30 22:25:53 +02:00
Matteo Giaccone
0808c0f6ef Remove default for git reset (#4993) 
The command will do the same as before, but now you can also specify
a path.

Example:
grh branch-name
grhh tag-name
 2018-06-12 18:23:31 +02:00
Chuan Jin
2642f0a8b4 Add git log with date (#6789) 2018-05-20 16:02:53 -07:00
George Kaklamanos
acacfec924 Remove unneeded option in glol and glola (#6059) 2018-04-25 14:14:33 +02:00
Mahmoud Hossam
ed85147e6e Rename clashing ag alias (#5849) 
* Fix ubuntu ag alias clashing with the silver searcher

* Add aliases for git apply and git merge --abort
 2017-11-07 08:06:41 -08:00
Jonathan Channon
5486aa21eb Added --force-with-lease method (#5025) 2017-11-07 08:06:19 -08:00
Tomas Chmelevskij
1700c948b4 Add chaced word diff (#6378) 2017-11-01 05:55:19 -07:00
Felipe Guilherme
456341fd69 Add git alias for staging tracked files (#5178) 
Although `gaa` (git add --all) is cool, it stages every file, tracked or
not, if it is not on .gitignore.

Sometimes we want to just stage everything we are working on, that is
already tracked. For that reason, 'gau' can save us some time.
 2016-12-17 18:01:13 +01:00
Jason Kurian
3477ff2527 feat: no CI on WIP commits (#5643) 2016-11-16 10:42:46 +01:00
Marc Cornellà
7f9b773350 Fix compdef commands in git plugin 
The command `compdef command=git` returns an error in some cases, the
appropriate command is `compdef _git command`.

Fixes #5442
 2016-10-04 17:23:20 +02:00
savimat
6d975f7258 Add alias for signed git commit with message (#5390) 
Signed-off-by: Mat Munn <mat@savi.com.au>
 2016-10-03 01:11:26 +02:00
Allan Lewis
c713407f90 git.plugin.zsh: Don't run Git hooks when making a WIP commit (#4751) 
When making a WIP commit, we generally just want to save the state of the
current branch temporarily, maybe because we want to push our work for backup
purposes, or change branch to work on something else. Therefore, it's generally
undesirable to run Git hooks, which might do things like run linters, because
we probably don't care if our WIP has lint errors.
 2016-09-30 13:45:28 +02:00
Luis Ferrer-Labarca
e9793fc199 Added 'gbd' alias for 'git branch -d' (#5417) 2016-09-19 19:50:16 -07:00
Marc Cornellà
298b63513d git plugin: remove `format:' from --pretty flag 
Changes gke, glol and glola aliases.

Fixes #5362
 2016-09-05 10:56:18 +02:00
Simon
b9c3e862c7 Add alias for checking out develop branch (#5307) 2016-08-21 19:46:37 +02:00
Marc Cornellà
76821f506c Rename gh alias (git help) to ghh 
This conflicts with several tools, including NodeGH [1] and
scm_breeze [2].

[1] https://github.com/robbyrussell/oh-my-zsh/issues/5313
[2] https://github.com/robbyrussell/oh-my-zsh/issues/5321

Related: #5130
 2016-08-20 23:53:12 +02:00
Emmanuel Isaac
9981214437 Add git alias to clear entire stash (#5306) 
Using the "gstc" alias runs "git stash clear"
that clears every stash index
 2016-08-18 09:22:21 +02:00
Dzianis Dashkevich
95371afdd8 Add gcpa and gcpc aliases to git plugin (#5271) 2016-08-14 17:58:11 -07:00
Robby Russell
b96a5877aa #5130 resolving conflict in git plugin for gh 2016-08-14 17:39:27 -07:00
Simen Bekkhus
ae21102030 (git): Add gpsup alias (#5287) 2016-08-11 02:47:54 +02:00
Marc Cornellà
7654b16b39 [git plugin] Fix indentation and organise aliases 2016-08-07 18:30:57 +02:00
Cédric Malard
f5537241a4 Fix gbda alias to support color.ui = always + exclude dev branches (#4304) 
* Fix gbda alias to support git config color.ui = always
* Update gbda alias to exclude develop and dev branches
 2016-08-01 18:16:54 +02:00
Marc Cornellà
c62442f999 Fix gfg function completion definition 
Related: #5179
 2016-06-21 01:06:21 +02:00
wangzengdi
5fa4d9d760 add alias gh=git help 2016-05-31 09:57:36 +08:00
Wasif Hasan Baig
bdc82114d0 Changd alias gsta='git stash' to alias gsta='git stash save'. 2016-05-26 10:26:01 -07:00
Ivan Mironov
d2712d3180 Add alias for oneline git tree with --all option 2016-05-18 12:28:36 +03:00
Wanbok Choi
615af65087 Add 'gcn!' for the '--no-edit' option. (#4830) 
Remove the '-s' option from 'gcan!'
Add 'gcans!'. It is the same as the current 'gcan! -s'.
 2016-05-14 13:45:55 +02:00
Marc Cornellà
b4a85eca9d Merge pull request #4728 from atk91/4727 
Remove --color flag from git log aliases

The way to colorize `git log` output is by setting the `color.ui` configuration.
 2016-03-30 04:46:22 +02:00
Filippo Valsorda
52737b1828 git.plugin: remove the conflicting gvt alias 
See FiloSottile/gvt#19 and FiloSottile/gvt#4
 2016-02-10 18:31:49 +00:00
atk91
d853ec4b62 Closes #4727 2015-12-25 11:33:29 +03:00
Andrew Janke
9f552130bd Move current_branch() from git plugin to core lib/git.zsh 
Fixes #4085: core -> plugin dependency issue.
Rename it to git_current_branch for clarity that it's git-specific.
Update all plugins that were calling it to use new name.
Fix variable leaks by making more variables in lib/git.zsh local.
Have lib/git.zsh use [[ ]] instead of [ ] everywhere.
 2015-12-14 20:28:37 -05:00
Robby Russell
57c2ac1e60 Merge pull request #4482 from sachin21/add_an_alias_for_upstream 
Add an alias for upstream
 2015-10-10 07:12:21 -07:00
Satoshi Ohmori
7597bf805e Add an alias for upstream 2015-10-10 11:51:33 +09:00
Bruno Volcov
252078dd6c add alias to sort by version 2015-10-09 18:47:48 -03:00
Michael SALIHI
8e74f7c1aa Add alias for print latest tag name 2015-09-24 02:22:50 +02:00
Robby Russell
a77e23a0f9 Merge pull request #4109 from zhiyelee/patch-1 
add git alias `gcam` -  git commit -am
 2015-08-30 21:52:07 -07:00
Matteo Giaccone
a2b574bc9e git plugin: make gclean safer, introduce gpristine 2015-07-30 12:32:41 +01:00
Zhiye Li
efb04d66a0 add git alias gcam - git commit -am 
add git alias `gcam` -  `git commit -am`
 2015-06-30 17:50:01 -05: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