Commit Graph

215 Commits

Author SHA1 Message Date
ZigZagT
280c99dae6
feat(git): accept default and mainline as main branches (#11431) 2023-01-06 00:03:12 +01:00
Ruslan Tursunov
5ab517361a
feat(git): add gcn alias (#10836) 2022-11-17 11:54:01 +01:00
Carlo Sala
0145d744a9
fix(git): escape first hyphen in gunwip 2022-11-07 12:59:12 +01:00
Hoàng
ac0924930d
feat(git): add aliases for worktree (#10079) 2022-11-07 09:47:59 +01:00
Carlo Sala
80fdbc9b91
fix(git): remove unused escape chars
Closes #11176
2022-11-04 19:45:17 +01:00
Wei Huang
e857cc8cb9
feat(git): alias gluc to sync with current branch in upstream (#11101) 2022-08-10 16:17:47 +02:00
Ian Cowan
5336e59db1
chore(git): fix unintentional latex in documentation (#11018) 2022-07-12 18:46:42 +02:00
Steven Pitts
e9e8c6b54d
feat(git): add gupom and gupomi aliases (#10261)
Co-authored-by: Steven Pitts <spitts@teikametrics.com>
2022-05-25 16:32:33 +02:00
Marc Cornellà
9c84c344d7
fix: disable log.showSignature in git log calls 2022-01-10 19:39:05 +01:00
Markus Hofbauer
58478d0888
feat(git): Add alias for rebasing to origin/main-branch (#10445) 2021-11-27 11:30:03 -08:00
Luka Markušić
6ac1ff6905
fix(git): fix directory parse from URL in gccd (#10276) 2021-10-09 13:42:17 +02:00
Michael Fryar
1c9a64ece6
feat(git): add gswm and gswd aliases (#9897)
Co-authored-by: Nathaniel Young <nathanielyoung95070@gmail.com>
2021-10-08 17:24:00 +02:00
Carlo Sala
bf7c1b160d
fix(git)!: rename gdu alias to gdup (#10263)
BREAKING CHANGE: the `gdu` alias has been renamed to `gdup` to avoid a
conflict with `go disk usage` (https://github.com/dundee/gdu).
2021-10-06 10:13:38 +02:00
fanuch
714399a7c3
feat(git): add gccd alias to clone and cd into git repository (#8220)
Fixes #8216
Closes #8220

Co-authored-by: Nelson Estevão <nelsonmestevao@gmail.com>
2021-10-04 17:31:05 +02:00
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
Stanisław
ff0d490915
git: clarify what the glp alias does (#8850) 2020-05-22 20:07:23 +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
glechic
4d1202c70c
git: fix markdown in README (#8769) 2020-03-24 19:24:47 +01:00
Marc Cornellà
610b2529d2 Clean up plugin READMEs and a few plugins
- fasd
- history
- mercurial
- pylint
- repo
- yii2
2020-03-11 19:57:46 +01: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