utils-code/wfxr.forgit
1
0
Fork 0
mirror of https://github.com/wfxr/forgit.git synced 2026-09-10 07:16:23 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
351 commits 9 branches 44 tags 4.4 MiB
Commit graph

351 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
sandroid ce19cc80ec
Added gct 2022-02-12 22:37:39 +01:00
Chris Apple 7b26cd46ac
Merge pull request #173 from cjappl/FixGaProblem 
Reverted change b1c4c11959 to fix fish ga
 2021-12-05 15:20:53 -08:00
Christopher Apple fe912482b5 Reverted change b1c4c11959 2021-12-05 15:17:05 -08:00
Chris Apple 4bea935fff
Merge pull request #171 from wfxr/FixFishGitAdd 
Fix for: ga preview not working with fish
 2021-12-05 15:03:26 -08:00
Chris Apple 656087369f Fixed git add for fish shell 2021-12-01 09:03:24 -08:00
Wenxuan 27d4a78756
Merge pull request #169 from p00f/fix_interactive_only_fish_preview 
use fish to interpret preview command
 2021-12-01 15:18:45 +08:00
Chinmay Dalal b1c4c11959
use fish to interpret preview command 
fixes #168
 2021-11-30 09:03:41 +05:30
Wenxuan Zhang b727321f2b
ci: remove outdated env 2021-10-26 18:45:45 +08:00
Wenxuan Zhang 5d15fd3532
refactor: ci lint 2021-10-26 18:40:26 +08:00
Peter Tri Ho ed51746687 fix: restore setting FORGIT_INSTALL_DIR in fish #165 2021-10-26 13:32:05 +11:00
Wenxuan Zhang a047bae35a
Revert "support fish shell" #164 
This reverts commit 950a7352db.
 2021-10-25 10:27:32 +08:00
Wenxuan eb6db722cd
Merge pull request #164 from wren/git-forgit-147 2021-10-22 10:41:00 +08:00
Wenxuan Zhang cef385bd44
docs: update git aliases description 2021-10-22 10:39:35 +08:00
Wenxuan Zhang b86dc4b0c8
refactor: reduce git alias config steps 2021-10-22 10:38:17 +08:00
Wenxuan Zhang 05ab1c5864
Revert "fix: gcb can switch to an existed branch" 
This reverts commit 8107352941.
 2021-10-20 10:55:53 +08:00
Wenxuan bb55cf3f0a
Merge pull request #163 from crazy-matt/fix-checkout-branch-with-slashes 2021-10-20 10:49:11 +08:00
Wenxuan Zhang 950a7352db
support fish shell 2021-10-20 10:17:03 +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 df36068105 add some comments for clarification 2021-10-17 23:36:16 -07:00
Jonathan Wren 8bcd87af38 change dash to underscore for bin/git-forgit 
Using an underscore instead of a dash simplifies the workflow and
documentation by making the commands and environment variables that
forgit uses the same (i.e. `git forgit checkout_file` is the same
command referred to by `forgit_checkout_file`)
 2021-10-17 23:33:00 -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
Jonathan Wren 896aaa44a4 add handling for standalone version of forgit (for use in git commands) 2021-10-17 22:56:32 -07:00
Wenxuan Zhang 8107352941
fix: gcb can switch to an existed branch 2021-09-23 10:17:23 +08:00
crazy-matt 6620e1347c
fix the checkout branch... 
...when a local branch exists and contains slashes in its name.
 2021-08-31 22:20:18 +01:00
Chris Apple 9f3a423920
Fix issue where gitignore cache was not being properly set up 
fix #161
 2021-08-02 09:15:02 -07:00
Chris Apple 339d364305
Merge pull request #159 from Cellane/fix-gcb-alias 
Fix `gcb` alias in Fish
 2021-07-19 10:39:52 -07:00