Commit graph

379 commits

Author SHA1 Message Date
carlfriedrich 52d79009d1 Preserve commit order on cherry pick
When using a fzf find string which maches multiple lines, the commits
could appear in a wrong order. Add "--tiebreak=index" to ensure that the
correct commit order is preserved.
2022-07-12 16:35:54 +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
Wenxuan 3506cfc365
Merge pull request #213 from ibayramli2001/fig
Add Fig as an installation method to the README
2022-06-16 09:31:46 +08:00
Ilkin Bayramli f1305dbdb0
Add Fig as an installation method to the README 2022-06-15 15:15:14 -07:00
sandroid 2d3dd568bb
gb: handle untracked files 2022-06-03 23:24:40 +02:00
sandroid 958e26add5
Added gb 2022-06-02 23:22:41 +02:00
Wenxuan 6385f85360
fix: gd show empty preview when path has spaces in zsh/bash (#204) 2022-05-28 17:04:23 -07:00
Wenxuan Zhang 544cf86bc4
docs: update comment 2022-05-20 17:44:51 +08: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
Wenxuan 0c4a3069ba
Merge pull request #199 from max-ae/fix/gd-spaces
fix: `forgit::diff` not working if repo path contains spaces
2022-05-10 10:02:04 +08:00
Max Eisner 25bb8aee24 fix: forgit::diff not working if repo path contains spaces 2022-05-10 10:00:57 +08:00
Wenxuan 6186ee7e47
Merge pull request #196 from pablombg/fix-checkout-branch
Fix gcb problems with verbosity and collation
2022-05-10 09:45:04 +08:00
Chris Apple fa9fd62439
Merge pull request #197 from petertriho/master
fix: `forgit::rebase` not working in fish
2022-04-10 07:23:36 -07:00
Peter Tri Ho 33ad0ea71e fix: forgit::rebase not working in fish 2022-04-10 15:31:00 +10:00
Pablo M. Bermudo Garay 4dd2ca2271 Fix gcb sort
Use LC_ALL=C to avoid potential ordering issues related to the user's
locale configuration. Additionally, add the --stable option to ensure
that just the range defined with --key is used.
2022-04-06 15:48:49 +02:00
Pablo M. Bermudo Garay d32e3c282b Fix gcb verbose output
Delete the verbose option of git checkout, so just the branch names are
displayed.
2022-04-06 15:47:06 +02:00
Wenxuan eed197948c
Merge pull request #193 from sandr01d/grc
Fixed: grc fails when commit is preceded by anything else than '* '
2022-04-02 09:33:10 +08:00
sandroid 6a9c0e3f82
Refactored grc 2022-04-01 23:41:00 +02:00
sandroid e4874bf763
Replaced eval in grc 2022-04-01 22:01:37 +02:00
sandroid 1f90f50d26
Fixed: grc fails when commit is preceded by anything else than '* ' 2022-03-27 19:18:32 +02:00
Chris Apple eddeea869d
Added rename support for fish with gd --staged
Added rename support for fish with gd --staged
2022-03-22 10:14:27 -07:00
Christopher Apple 701e3f3a4a Added rename support for fish 2022-03-22 09:06:52 -07:00
Chris Apple d0b3cfca33
Catching fish up on a bunch of new features
Checked in a bunch of things that were only for bash #189 #186 #185 #190 #188
2022-03-21 09:57:40 -07:00
Christopher Apple b61df0c206 Added support for FORGIT_GLO_FORMAT 2022-03-21 09:49:00 -07:00
Christopher Apple c096f2bbda Added multi diff support for gd 2022-03-21 09:36:11 -07:00
Christopher Apple b98722008c Revert "Added multi diff support for gd"
This reverts commit 5b31faf7e2.
2022-03-21 09:35:51 -07:00
Christopher Apple 5b31faf7e2 Added multi diff support for gd 2022-03-21 09:33:55 -07:00
Christopher Apple f8514beb26 Adding grc 2022-03-21 08:31:40 -07:00
Christopher Apple 2fc1436d1b Revert "Bad test commit to be reverted"
This reverts commit e89f9f195e.
2022-03-21 08:30:59 -07:00
Christopher Apple 687710f2cd Revert "Revert "Bad test commit to be reverted""
This reverts commit bdb04ecb84.
2022-03-21 08:30:57 -07:00
Christopher Apple 63fdf99956 Revert "Revert "Revert "Bad test commit to be reverted"""
This reverts commit 37731d4da3.
2022-03-21 08:30:53 -07:00
Christopher Apple fc9d031608 Revert "Revert "Revert "Revert "Bad test commit to be reverted""""
This reverts commit 0cde6852bc.
2022-03-21 08:30:50 -07:00
Christopher Apple 0cde6852bc Revert "Revert "Revert "Bad test commit to be reverted"""
This reverts commit 37731d4da3.
2022-03-21 08:29:44 -07:00
Christopher Apple 37731d4da3 Revert "Revert "Bad test commit to be reverted""
This reverts commit bdb04ecb84.
2022-03-21 08:22:15 -07:00
Christopher Apple bdb04ecb84 Revert "Bad test commit to be reverted"
This reverts commit e89f9f195e.
2022-03-21 08:09:39 -07:00
Christopher Apple e89f9f195e Bad test commit to be reverted 2022-03-21 08:05:39 -07:00
Christopher Apple 4027bee420 Apparently working preview update 2022-03-21 07:52:58 -07:00
Wenxuan 495ac3cba6
Merge pull request #186 from carlfriedrich/make-preview-argument-overridable
Make fzf '--preview' argument overridable in environment
2022-03-21 19:15:50 +08:00
carlfriedrich 76663aaf19 Make fzf '--preview' argument overridable in environment
Arguments to fzf are passed via the FZF_DEFAULT_OPTS environment
variable, which can be overridden by a dedicated FORGIT_<cmd>_FZF_OPTS
variable for each command separately. The '--preview' argument, however,
was excluded from this mechanism and hard-coded to the fzf call, so that
there was no chance overriding it.
This patch moves the passing of this argument to the FZF_DEFAULT_OPTS
variable for all commands, so that it can be overridden as well.

Fixes #185
2022-03-21 10:04:12 +01:00
Wenxuan c9185dda1a
Merge pull request #190 from sandr01d/grc
Implemented git revert commit
2022-03-21 08:43:56 +08:00
Wenxuan fca195a925
Merge pull request #189 from carlfriedrich/improve-forgit-diff
Improve forgit diff
2022-03-21 08:29:04 +08:00
Wenxuan 2d7e6103fe
Merge pull request #183 from wallace11/master
Add missing support for `FORGIT_GLO_FORMAT`
2022-03-21 08:23:46 +08:00
sandroid 45cab4df9b
Added grc 2022-03-19 20:11:58 +01:00
carlfriedrich 2e5f06e789 gd: improve visualization for move/rename
Show an arrow instead of just blank spaces when a file has been moved
or renamed:

[R100]  foo.txt  ->  bar.txt

The arrow is added as a replacement for the second tabspace of the "git
diff --name-status" command. For the preview command it is replaced by a
single space again.
2022-03-11 19:18:13 +01:00
carlfriedrich 5093c18532 gd: support git move/rename
For "git diff" to display a move/rename action correctly, it has to be
passed both the old and the new file name. Change the gd preview command
accordingly: instead of constructing a path out of the repo directory
and the file name (which would not work with multiple file names), cd to
the repo directory and use the file names as direct arguments to "git
diff" instead.

Change the regex used to parse the "git diff --name-status" output so
that it supports the "Rxxx" syntax for moved/renamed files.

Use tabs instead of hardcoded number of spaces along with "expand" to
have file names horizontally aligned.

Fixes wfxr/forgit#188
2022-03-11 18:37:30 +01:00
carlfriedrich 7d43115881 gd: support passing two revisions
Fixes wfxr/forgit#187
2022-03-10 11:35:54 +01:00
wallace 2aaa8fb6af Add missing support for FORGIT_GLO_FORMAT 2022-02-23 20:58:59 +02:00
Wenxuan e0d3552d45
Merge pull request #182 from sandr01d/gct
Implemented git checkout tag
2022-02-15 10:27:33 +08:00