Commit graph

134 commits

Author SHA1 Message Date
sandr01d 455e42ba64
Feature: add interactive reword selector (#443) 2025-05-29 20:51:12 +02:00
sandr01d c2b012855f
Feature: add interactive squash selector (#440) 2025-05-25 18:21:56 +02:00
carlfriedrich 18f1a1e0c3
Meta: Improve the documentation for overriding aliases (#426)
Some checks failed
ci / build (ubuntu-22.04) (push) Failing after 1s
ci / build (macos-latest) (push) Has been cancelled
ci / build (ubuntu-20.04) (push) Has been cancelled
2025-02-24 14:09:06 +01:00
crazy-matt 4dc0f5474a
Update README.md (#425)
Some checks failed
ci / build (ubuntu-22.04) (push) Failing after 1s
ci / build (macos-latest) (push) Has been cancelled
ci / build (ubuntu-20.04) (push) Has been cancelled
Adding sheldon.cli configuration for zsh as an example.
2025-02-23 13:09:51 +01:00
sandroid 0d65efc769 Feature: Add interactive git attributes generator
Some checks failed
ci / build (macos-latest) (push) Waiting to run
ci / build (ubuntu-20.04) (push) Waiting to run
ci / build (ubuntu-22.04) (push) Failing after 1s
2025-02-14 20:29:33 +01:00
carlfriedrich bb83b3cba0
Feature: add forgit show command (#417)
Some checks failed
ci / build (ubuntu-22.04) (push) Failing after 1s
ci / build (macos-latest) (push) Has been cancelled
ci / build (ubuntu-20.04) (push) Has been cancelled
Introducing `show` as a new subcommand of `forgit`, an interactive
version of `git show`. The configured default alias is `gso`.

Alt-T can be used to toggle between showing the diff and the commit
message in the fzf preview window.

The new command in used instead of `forgit diff` when pressing enter
in `forgit log`. This fixes the display of diffs for merge commits.

**Note**: we have a requirement for the `fzf` version now. The minimum
required `fzf` version is 0.49.0. If the installed version is lower,
forgit will exit with an error message.

Fixes #416.
2025-01-29 07:04:07 +01:00
sandr01d fdae9cb235
Meta: add tree as an optional dependency (#420)
Some checks failed
ci / build (macos-latest) (push) Has been cancelled
ci / build (ubuntu-20.04) (push) Has been cancelled
ci / build (ubuntu-22.04) (push) Failing after 1s
2025-01-22 20:28:56 +01:00
Wenxuan Zhang 755b3dd9f8
chore: rename default branch (#410) 2024-12-16 22:35:07 +08:00
Ondřej Súkup 60b651de7e
Meta: remove mention of Fig from docs (#400)
Some checks failed
ci / build (ubuntu-22.04) (push) Failing after 0s
ci / build (macos-latest) (push) Has been cancelled
ci / build (ubuntu-20.04) (push) Has been cancelled
Fig was effectively sunset by Amazon from 1. September 2024
2024-10-18 11:37:52 +02:00
sandr01d be82c47ceb
Feature: Add interactive git reflog (#398)
Some checks failed
ci / build (ubuntu-22.04) (push) Failing after 1s
ci / build (macos-latest) (push) Has been cancelled
ci / build (ubuntu-20.04) (push) Has been cancelled
2024-09-04 22:02:27 +02:00
ccoVeille f3616b00cf
Fix typos in README.md (#390)
* Fix some typos and wordings
* Fix headers style: no double spaces
* Fix "e.g." usage (Latin)
2024-04-24 19:50:11 +02:00
sandr01d bc408f155c
Add a preview to _forgit_clean (#383) 2024-04-19 21:12:16 +02:00
Chris Apple 00ed721ece
Consolidate zsh completions in one file (#340)
Moved the completion definitions for zsh that previously were in completions/git-forgit.zsh and had to be sourced manually on shell startup into completions/_git-forgit, where they are automatically handled by compinit on shell startup. Sourcing a file to get completions is no longer necessary for zsh users.
If you're having issues after updating, and completions for commands such as `forgit::add` or aliases like `ga` aren't working, remove your completions cache (~/.zcompdump) and restart your shell.
Simplified _git-forgit to allow it to be called from within the completion script on the first run of a session.

---------

Co-authored-by: sandr01d <88739791+sandr01d@users.noreply.github.com>
2024-02-09 22:17:22 +01:00
Chris Apple ab7400ddb3
README: Add more explicit instructions for brew, fix headers for AUR, Fig (#339)
Added more explicit instructions, now that I know how our brew installation process works.

While I was there, I moved AUR and Fig to be subheaders of Installation
2024-01-30 06:43:52 -08:00
Chris Apple c663dc1764
README tweak: decrease level of headers (#337) 2024-01-29 10:49:11 -08:00
Edwin Kofler d7f88d75b6
Remove extraneous PATH export (#329) 2023-12-20 06:50:44 -08:00
sandr01d 6cbbe1805a
Removed the note about using forgit as a git subcommand from the 'tips' section (#321)
The note was redundant because it is explained in more detail in the 'git integration' section.
2023-08-06 16:52:49 +02:00
Michael Bianco f1ac9e3f7f
docs: example of using config vars to sort git branch (#319) 2023-07-12 10:59:30 -07:00
sandr01d 500808d73b
Add AUR release action (#315) 2023-07-04 10:06:00 +08:00
Wenxuan c78c10a028
feat: add a keybind to open current file in editor (#313)
* feat: add a keybind to open current file in default editor

---------

Signed-off-by: Wenxuan Zhang <wenxuangm@gmail.com>
Co-authored-by: sandr01d <88739791+sandr01d@users.noreply.github.com>
2023-06-19 09:26:07 +08:00
sandr01d ec1bd21468
Added completions for zsh (#310) 2023-06-13 21:55:50 +02:00
Tom f73ae9754e
Allow configuration of checkout_branch branch cmd (#307) 2023-05-16 08:45:18 -07:00
Patrick Linnane e8ad636ab0
README: add brew instructions (#302) 2023-05-04 08:38:26 +02:00
Tim adf4e7feb9
Fix wrong documentation of tab toggle direction (#299)
See https://github.com/junegunn/fzf/issues/3256 for reference.

Fixes #298
2023-04-26 13:15:33 +02:00
Tim 3f00348d5c
Add keybinding ctrl+y for copying stash ID in gss (#295) 2023-03-18 16:35:18 +01:00
Tim 2a2ee36d56
Add git options for each forgit command (#292)
The git behavior within forgit can now be customized with a dedicated
variable for each forgit command, e.g. `FORGIT_ADD_GIT_OPTS` is passed
to the `git add` call within `ga`.

Also renaming `FORGIT_STASH_PUSH_OPTS` to `FORGIT_STASH_PUSH_FZF_OPTS`
and `FORGIT_REVERT_COMMIT_OPTS` to `FORGIT_REVERT_COMMIT_FZF_OPTS`
for consistency.
2023-03-18 12:25:20 +01:00
Christian Fratta 065f7841f3
Meta: Include oh-my-zsh install instructions in README (#283) 2023-02-10 10:26:59 +01:00
Tim aa85792ec4
Add bash completions for forgit functions and aliases (#275)
When using forgit via the shell plugin, source 'git-forgit.bash'
explicitly after 'forgit.plugin.zsh' to enable tab completion for forgit
shell functions and aliases.
2023-01-30 17:46:52 +01:00
Tim 73aea65778
Add bash completions for git-forgit (#235)
When using forgit as a subcommand of git, put 'git-forgit.bash' in one
of the following places and it will be loaded automatically on tab
completion of 'git forgit' or any configured git aliases of it:

- /usr/share/bash-completion/completions
- ~/.local/share/bash-completion/completions
2023-01-11 10:57:16 +01:00
sandr01d f8c0edfc17
Added git stash push selector 'gsp' (#251)
A message can be passed via named argument (-m or --message). All other
arguments (e.g. file paths) will cause git stash push to be run directly without
invoking fzf.
2022-12-14 15:53:52 +01:00
carlfriedrich da9210e972 Meta: update documentation 2022-11-17 10:19:32 +01:00
ccoVeille f6040b21a0
fix typo in comments and README files (#230) 2022-08-09 19:07:59 -07:00
carlfriedrich 8d3ecb6ccf Add variables for diff context
Introduce FORGIT_DIFF_CONTEXT for the diff context when viewing a diff
and FORGIT_PREVIEW_CONTEXT for the diff context in the preview window.
2022-07-22 14:26:08 +02:00
carlfriedrich 53d0ea2f38 Add FORGIT_CHERRY_PICK_FZF_OPTS
The gcp (git cherry pick) command was the only command which did not
have a variable to set command-specific fzf options. Add the according
variable to source code and documentation.
2022-07-12 16:35:54 +02:00
Wenxuan 98a5cc27a1
Merge pull request #211 from sandr01d/gb
Feature: Added interactive git blame
2022-06-17 22:14:12 +08:00
sandroid f8b1fc8545
Changed alias for forgit::blame to gbl 2022-06-16 22:34:13 +02:00
Ilkin Bayramli f1305dbdb0
Add Fig as an installation method to the README 2022-06-15 15:15:14 -07:00
sandroid 958e26add5
Added gb 2022-06-02 23:22:41 +02:00
Chris Apple 75e9d12bac
Adding support for git branch delete method (#200)
* Adding support for git branch delete method in fish

* Add new doc to README

* Added options like gcb

* refactor: remove `--all` flag from gbd

* feat: sync forgit::branch::delete to bash and zsh

Co-authored-by: Wenxuan Zhang <wenxuangm@gmail.com>
2022-05-11 09:41:21 -07:00
sandroid 45cab4df9b
Added grc 2022-03-19 20:11:58 +01:00
sandroid ce19cc80ec
Added gct 2022-02-12 22:37:39 +01:00
Wenxuan Zhang cef385bd44
docs: update git aliases description 2021-10-22 10:39:35 +08:00
Jonathan Wren 5403f42acf add to readme 2021-10-17 23:42:26 -07:00
Jonathan Wren 96d0924aef fix typos in docs 2021-10-17 23:40:42 -07:00
Jonathan Wren d6fa65ec92 clean up documentation format for readme alias section 2021-10-17 23:18:46 -07:00
Jonathan Wren 800b35c687 update alias documentation 2021-10-17 23:16:13 -07:00
Wenxuan Zhang 7c1d3b859e
feat: add gco to checkout a commit 2021-04-07 17:23:00 +08:00
Wenxuan Zhang 6529356615
docs: add a link to #147 2021-04-01 09:40:18 +08:00
Wenxuan Zhang e45eff4904
docs: fix contributors badge 2021-03-29 12:15:58 +08:00
Ariel Davidov 69d6639220
feat: add fixup function (#146)
* Add fixup function

Signed-off-by: Ariel Davidov <arik.davidov@gmail.com>

* refactor: more accurate editor

* refactor: support to fixup the first commit

Co-authored-by: Wenxuan Zhang <wenxuangm@gmail.com>
2021-03-29 12:08:38 +08:00