Commit Graph

245 Commits

Author SHA1 Message Date
Marc Cornellà
f79647dba5
fix(git): fix check in gbds function 2023-10-19 22:05:03 +02:00
Zeeshan
207d29b716
fix(git)!: standardize git pull --rebase aliases (#11224)
BREAKING CHANGE: The alias `gup` for `git pull --rebase` and its derivatives
are replaced by `gpr` for standardization. This means the previous aliases will
no longer be available after a few months. Meanwhile, the original aliases are
still working, with a deprecation notice.
See https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/git/README.md#deprecated-aliases
for the full list of deprecated aliases.

Fixes #11104
Closes #11224

Co-authored-by: Marc Cornellà <marc@mcornella.com>
2023-10-19 22:00:04 +02:00
Marc Cornellà
8152dc673b
fix(git): move squash-merged branch deletion from gbda to gbds function (#11991) 2023-10-18 20:01:58 +02:00
Marc Cornellà
f939768751
fix(git): fix fallback to develop branch if master not found (#11966) 2023-10-14 16:40:45 +02:00
Adam Johnson
b1821a24f0
fix(git): restore showing patch in gsts (#11951) 2023-10-10 17:56:54 +02:00
tobi1805
24b2600558
feat(git): delete squash-merged branches in gbda (#11948) 2023-10-09 18:07:51 +02:00
Carlo Sala
0e1e877ea9
fix(git)!: remove gt alias
BREAKING CHANGE: `gt` alias clashes with Graphite CLI
(https://graphite.dev). See https://github.com/ohmyzsh/ohmyzsh/pull/11910#issuecomment-1736340910
2023-09-27 08:19:59 +02:00
Adam Johnson
4fb5d02db9
feat(git): add reset aliases grhk and grhs (#11896) 2023-09-26 09:31:32 +02:00
Adam Johnson
e2b855341b
feat(git): add tag aliases gt and gta (#11910)
Co-authored-by: hasecilu <hasecilu@protonmail.com>
Co-authored-by: Rik <gitaarik@posteo.net>
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
2023-09-26 09:27:48 +02:00
Adam Johnson
bca62f78e2
feat(git): add branch rename alias gbm (#11909)
Co-authored-by: Gabriel Akinyosoye <gabrielfemi799@gmail.com>
2023-09-26 09:22:32 +02:00
Adam Johnson
aaa74964a8
fix(git): remove --text from gsts (#11897) 2023-09-26 09:18:54 +02:00
Adam Johnson
a17789eede
docs(git): improve tables and language (#11895) 2023-09-25 10:49:22 +02:00
Adam Johnson
6a7aab47dd
docs(git): align markdown table borders (#11878) 2023-09-06 12:42:09 +02:00
Adam Johnson
331f3c8b2e
feat(git): add bisect aliases gbsn and gbso (#11869) 2023-09-06 12:36:57 +02:00
Adam Johnson
bae577d6b2
fix(git)!: remove -b from blame alias (#11864) 2023-09-05 12:41:50 +02:00
Zhang Visper
c92af18c36
fix(git): some aliases under non-english LANG (#11855) 2023-08-24 11:37:38 +02:00
Miguel Hargreaves Pimenta
33c0de7add
refactor(git): sort git aliases alphabetically (#9743) 2023-08-23 13:38:32 +02:00
Devraj Mehta
8cbe98469d
fix(git): remove color codes from some aliases (#11770) 2023-06-26 19:05:22 +02:00
Ihor
f5cb9a6c97
fix(git): gunwipall now only resets once (#11758)
Closes #11750 

Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
2023-06-17 13:28:55 +02:00
Ihor
115cee1701
feat(git): add gunwipall function (#11725)
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
2023-06-05 10:38:54 +02:00
Tom D
fb4213c34f
perf(git): improve gunwip alias (#11714) 2023-05-26 09:43:17 +02:00
Aleks
ad99f0c164
feat(git): add merge squash alias (gms) (#10937) 2023-04-08 13:36:54 +02:00
Francesco Ilario
8c808da23c
feat(git): add aliases for gone branches (#9250)
Closes #8457 
Closes #9973
2023-02-20 15:35:58 +01:00
guenthgr
cc73a929f6
feat(git): add gpod alias
Closes #11501
2023-02-17 17:30:39 +01:00
Carlo Sala
45571bfa03
fix(git): gpristine requires two --force flags
Fixes #11483
2023-02-08 11:35:48 +01:00
Carlo Sala
87f1941d27
docs(git): remove duplicated line 2023-02-07 16:17:07 +01:00
Unnit Metaliya
d48cbb82b1
feat(git)!: add force-if-includes flag (#11481)
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>

Closes #11388

BREAKING CHANGE: `gpf` and `gpsupf` now have the `--force-if-includes` flag if git version is greater than 2.30. It will make force pushes more safer. See https://stackoverflow.com/questions/65837109/when-should-i-use-git-push-force-if-includes
2023-02-06 12:07:40 +01:00
Taehyun Hwang
39525e5ec3
feat(git): add gpsupf alias (#11268) 2023-01-28 18:45:23 +01:00
Romain Janvier
6dc6646d52
docs(git): add missing entries and run formatter 2023-01-12 13:56:45 +01:00
Jack DeVries
35454190f6
feat(git): use verbose flags in aliases
Closes #11244
Closes #11246
Closes #10101
Closes #11380
2023-01-12 13:51:18 +01:00
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