Commit Graph

263 Commits

Author SHA1 Message Date
3151c9c1a3 fix(git): re-add accidentally removed gcn (#12681) 2024-09-18 12:58:00 +02:00
2056aeeead Revert "feat(git)!: ask for confirmation in gpf alias (#10169)"
This reverts commit c13795d4c4.
2024-08-18 11:22:30 +02:00
b0204f7839 feat(git): add gmff, gprum(i), grbum aliases to work with upstream remotes (#11428) 2024-08-15 17:53:03 +02:00
c13795d4c4 feat(git)!: ask for confirmation in gpf alias (#10169)
- Rename `git push --force-with-lease ...` to `gpff`
- Add a y/n confirmation prompt to `gpf` before running `git push --force-with-lease ...`

BREAKING CHANGE: this change adds a confirmation prompt to the `gpf` alias before
running the potentially destructive `git push --force-with-lease` command. If you
want to force-run the command without having to confirm it, run `gpff`.
2024-08-15 16:48:03 +02:00
44ea99e7b9 feat(git): fetch tags in gfa alias (#12558) 2024-08-01 09:01:34 +02:00
5233759206 feat(git): add gclf alias (#12508) 2024-07-02 13:30:39 +02:00
1b29fd3a46 feat(git): support stable in git_main_branch (#12447) 2024-05-23 12:51:02 +02:00
0fabd5f22f fix(git): add checked-out branch support to gbg* (#12397) 2024-05-10 19:17:18 +02:00
3e2a5742cd feat(git): add alias gmc for git merge --continue (#12326)
Co-authored-by: PJ Kim <pj.0x08@kakaocorp.com>
2024-04-08 22:40:15 +02:00
5bff59f78e docs(git): add gwipe alias 2024-04-08 22:05:23 +02:00
a6ce40df49 feat(git): introduce gwipe alias (#12302)
`gpristine` might be too much on several occasions, given that it removes all untracked files. This might not be ideal because it will delete important things like environment files and encryption keys.

With that in mind, this commit introduces `gwipe` as a way to get a "clean slate" but still have your dev environment working.
2024-04-08 08:48:57 -07:00
6f215cd692 feat(git): add grf alias (#12176) 2024-02-01 17:00:27 +01:00
8be4789bbb feat(git): add greva and grevc aliases (#12042) 2024-01-13 18:56:23 +01:00
cb7ff9fb14 feat(git): add gcann! alias (#12041) 2024-01-13 18:54:56 +01:00
1c8dee848d docs(git): align gpristine alias (#12155)
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
2024-01-10 21:41:43 +01:00
ec74eb91bd feat(git): add gcB alias (#12116) 2023-12-27 13:47:58 +01:00
b6bb133f23 fix(git): fix repository detection in gccd function (#12023)
Fixes #12023
2023-11-08 08:42:34 +01:00
ff6dac56a2 fix(git): fix smart cd to cloned directory in gccd function 2023-10-19 23:04:08 +02:00
f79647dba5 fix(git): fix check in gbds function 2023-10-19 22:05:03 +02:00
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
8152dc673b fix(git): move squash-merged branch deletion from gbda to gbds function (#11991) 2023-10-18 20:01:58 +02:00
f939768751 fix(git): fix fallback to develop branch if master not found (#11966) 2023-10-14 16:40:45 +02:00
b1821a24f0 fix(git): restore showing patch in gsts (#11951) 2023-10-10 17:56:54 +02:00
24b2600558 feat(git): delete squash-merged branches in gbda (#11948) 2023-10-09 18:07:51 +02:00
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
4fb5d02db9 feat(git): add reset aliases grhk and grhs (#11896) 2023-09-26 09:31:32 +02:00
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
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
aaa74964a8 fix(git): remove --text from gsts (#11897) 2023-09-26 09:18:54 +02:00
a17789eede docs(git): improve tables and language (#11895) 2023-09-25 10:49:22 +02:00
6a7aab47dd docs(git): align markdown table borders (#11878) 2023-09-06 12:42:09 +02:00
331f3c8b2e feat(git): add bisect aliases gbsn and gbso (#11869) 2023-09-06 12:36:57 +02:00
bae577d6b2 fix(git)!: remove -b from blame alias (#11864) 2023-09-05 12:41:50 +02:00
c92af18c36 fix(git): some aliases under non-english LANG (#11855) 2023-08-24 11:37:38 +02:00
33c0de7add refactor(git): sort git aliases alphabetically (#9743) 2023-08-23 13:38:32 +02:00
8cbe98469d fix(git): remove color codes from some aliases (#11770) 2023-06-26 19:05:22 +02:00
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
115cee1701 feat(git): add gunwipall function (#11725)
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
2023-06-05 10:38:54 +02:00
fb4213c34f perf(git): improve gunwip alias (#11714) 2023-05-26 09:43:17 +02:00
ad99f0c164 feat(git): add merge squash alias (gms) (#10937) 2023-04-08 13:36:54 +02:00
8c808da23c feat(git): add aliases for gone branches (#9250)
Closes #8457 
Closes #9973
2023-02-20 15:35:58 +01:00
cc73a929f6 feat(git): add gpod alias
Closes #11501
2023-02-17 17:30:39 +01:00
45571bfa03 fix(git): gpristine requires two --force flags
Fixes #11483
2023-02-08 11:35:48 +01:00
87f1941d27 docs(git): remove duplicated line 2023-02-07 16:17:07 +01:00
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
39525e5ec3 feat(git): add gpsupf alias (#11268) 2023-01-28 18:45:23 +01:00
6dc6646d52 docs(git): add missing entries and run formatter 2023-01-12 13:56:45 +01:00
35454190f6 feat(git): use verbose flags in aliases
Closes #11244
Closes #11246
Closes #10101
Closes #11380
2023-01-12 13:51:18 +01:00
280c99dae6 feat(git): accept default and mainline as main branches (#11431) 2023-01-06 00:03:12 +01:00
5ab517361a feat(git): add gcn alias (#10836) 2022-11-17 11:54:01 +01:00