carlfriedrich
7b1ebff09f
Add variable "forgit_extract_sha"
...
This reduces code duplication. We cannot implement this as a function,
because fish and zsh do not support exporting functions, but we need it
in subshells (see https://github.com/fish-shell/fish-shell/issues/6961 ).
Implement it as a variable in all shells instead.
2022-07-26 09:21:42 +02:00
Wenxuan
041bc9a377
Merge pull request #221 from carlfriedrich/improve-forgit-diff
...
Improve forgit::diff
2022-07-26 09:31:16 +08: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
bb4514a359
Improve forgit::diff
...
* Show additional context on enter compared to preview
* Show selected diff range in fzf prompt
2022-07-17 16:42:11 +02:00
Chris Apple
bd8fce74a6
Fish didn't like the tac/tail switch. Also removed some print statements ( #220 )
2022-07-14 19:05:09 -07:00
Chris Apple
6ce2c25490
Fish: Fix GA and GD when there is whitespace in the name ( #209 )
2022-07-14 09:25:51 -07:00
Tim
fdd5632b17
Fix cherry pick preview ( #218 )
...
The preview on cherry pick was accidentally broken since we included the
+/- information in the commit list. Fix this by using the correct string
index.
2022-07-14 09:24:56 -07:00
Wenxuan
d2c2848037
Merge pull request #216 from carlfriedrich/improve-cherry-pick
...
Improve cherry-pick
2022-07-14 08:41:24 +08:00
carlfriedrich
fe5c4d9881
Reverse order on cherry pick
...
Git log displays the newest commits on top of the list, while git cherry
pick displays the newest commits at the bottom. Reverse the order of
git cherry pick so that it has the same order like git log.
2022-07-13 12:33:55 +02:00
carlfriedrich
1b7db0fb6e
Preserve +/- information on cherry pick
...
The output of 'git cherry' which is used to build the fzf input list for
forgit::cherry::pick usually prefixes every line with a '-' for commits
that have an equivalent in the target branch, and a '+' for commits that
do not.
Previously forgit removed this information from the list. However, for
the actual cherry-picking process this information is relevant, so we
should keep it.
2022-07-12 16:42:18 +02:00
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
