Commit Graph

184 Commits

Author SHA1 Message Date
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
c99f3c50fa git: go back to previous main branch detection logic
Fixes #9114
2020-07-15 17:02:49 +02:00
83f6194929 git: change docs for git_main_branch
Also remove unnecesary dramatic remark
2020-07-11 20:18:05 +02:00
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
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
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
255ef8d587 git: add alias for git diff excluding lock files (#8935) 2020-05-23 18:57:13 +02:00
ff0d490915 git: clarify what the glp alias does (#8850) 2020-05-22 20:07:23 +02:00
77b409d5c2 git: add convenience aliases for git apply and git am (#8563) 2020-05-22 16:56:03 +02:00
a25efd1e31 git: exclude devel branch from list in gbda alias (#8957) 2020-05-22 16:54:10 +02:00
d8f674cc8e git: exclude 'development' in gdba alias (#8902) 2020-05-21 18:13:14 +02:00
4d1202c70c git: fix markdown in README (#8769) 2020-03-24 19:24:47 +01:00
610b2529d2 Clean up plugin READMEs and a few plugins
- fasd
- history
- mercurial
- pylint
- repo
- yii2
2020-03-11 19:57:46 +01:00
831089a375 git: make the gpristine alias remove untracked git repos (#8697) 2020-03-03 14:06:40 +01:00
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
aa4146a9a4 git: add alias for git stash --include-untracked (#8617) 2020-02-15 18:28:02 +01:00
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
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
de3b14cf69 git: add aliases for git switch and restore (#8089) 2019-08-20 12:11:38 +02:00
6cb98eda15 git: add missing grev alias to README (#7984) 2019-07-11 20:42:28 +02:00
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
4ad4a81657 git: clean up plugin file and delete current_repository function
Closes #6329
2019-05-21 11:04:01 +02:00
f8d5fdce3a git: move documentation from wiki to README 2019-05-21 11:04:01 +02:00
7824dc637d git: use is-at-least to test for git version
Fixes #7754
2019-04-10 11:47:29 +02:00
b31106b341 git: minor syntax fix 2019-04-09 18:35:09 +02:00
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
1bd72f588c Update to inline conditional syntax 2019-04-09 18:29:18 +02:00
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
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
93cbc1614c git: use interactive mode in gclean
Fixes #7716
2019-03-31 15:56:35 +02:00
4b82b86064 git: add --no-gpg-sign to gwip (#6031) 2019-03-29 22:59:37 +01:00
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
f6a9a0a498 git: fix grt on path with spaces
Fixes #7682
2019-03-25 18:46:18 +01:00
9509fd6a91 Add git reset to origin alias to git plugin (#7630) 2019-03-10 09:38:06 -07:00
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
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
3c16466a14 git: quote branch name in ggpull and ggpush (#7472) 2019-01-20 20:19:07 +01:00
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
5ee93f4f15 git: add git rm aliases (#5433)
* grm for 'git rm'
* grmc for 'git rm --cached'
2018-09-12 19:08:12 +02:00
0db7da0cd5 git: add push force aliases (#6297)
* gpf to --force-with-lease
* gpf! to --force
2018-09-12 19:05:57 +02:00
a3afeca3eb git: add gbD alias to force-delete branch (#5844) 2018-09-12 18:38:21 +02:00
d5f0a0a413 git: add glols alias for glol --stat (#5871) 2018-09-12 16:57:48 +02:00
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
3d2542f41b git: add pull rebase --autostash aliases (#6791) 2018-09-12 15:52:42 +02:00
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
652356b9b9 git: add the git show alias gsh (#5591) 2018-08-23 22:04:42 +02:00
035d78120c Add Git alias for git diff --staged (#7064) 2018-08-15 19:44:06 +02:00
1691cf8a99 Add alias for git add --verbose (#3167)
Add alias `gav='git add -v'`
fixes #6793
2018-08-13 21:11:25 +02:00
b6ca933a02 Add alias for 'git rebase develop' (#6006) 2018-06-30 22:25:53 +02:00
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