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
264 commits 9 branches 44 tags 4.4 MiB
Commit graph

264 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wenxuan 84c515db1d
Merge pull request #128 from 7ocb/reset-color-after-each-line 
Reset color in git format after each line
 2020-12-23 09:14:09 +08:00
me 0e7399ce15 Reset color in git format after each line so next line does not get affected 2020-12-22 08:13:01 +03:00
Chris Apple 1397e6904b
Merge pull request #126 from frediz/fix-diff-execute-command 
Fix forgit::diff's fzf execute because of undefined $cmd
 2020-12-03 10:08:23 -08:00
Frédéric Bonnard 2baf9180ff Fix forgit::diff's fzf execute because of undefined $cmd 2020-12-03 15:37:28 +01:00
Wenxuan Zhang dde028120e
docs: prefer delta to diff-so-fancy 2020-11-25 10:23:42 +08:00
Wenxuan Zhang 95526b3130
refactor: replace "-R" with "-r" for less pager 2020-11-11 19:36:14 +08:00
Chris Apple b4b0e10a05
Merge pull request #124 from wfxr/fish_rebase 
Git rebase for fish shell
 2020-11-09 10:23:41 -08:00
Christopher Apple 32807e67da Git rebase for fish shell 2020-11-09 10:07:47 -08:00
Chris Apple d142b681ff
Merge pull request #122 from wfxr/feat-rebase 
Add rebase function
 2020-11-06 09:05:27 -08:00
Wenxuan Zhang 074059454d
docs: add grb docs 2020-11-03 15:49:55 +08:00
Wenxuan Zhang 968d362997
feat: add forgit::rebase function 2020-11-03 15:47:11 +08:00
Wenxuan Zhang 50495dc421
docs: update fish shorten url etc (#116) 2020-10-14 12:33:00 +08:00
Wenxuan Zhang 2d950aa2c4
fix: export global variables for omf (#116) 2020-10-14 12:11:56 +08:00
Wenxuan Zhang 18edc577a0
refactor: replace symbol link with actual file (#116) 2020-10-14 10:33:26 +08:00
AoHiyuki 56f5aaafbc
feat: add fisher support for fish 
Fix typo in function name and add some function descriptions

Update fish ci job

Update README

Update README for fish manual installation, revert shortlink

Merge all the files back to 1 like before

refactor: use symbol link

docs: simplify changes
 2020-10-13 11:04:47 +08:00
Wenxuan Zhang dccfff52e5 refactor: FORGIT_IGNORE_PAGER etc. (#112) 2020-09-11 17:20:46 +08:00
Wenxuan Zhang 6c6e493b94 refactor: prefer using .cache directory 2020-09-11 17:11:58 +08:00
Wenxuan Zhang 56ece45973 fix: fix FORGIT_GI_REPO_LOCAL error in subshell 2020-09-11 16:59:00 +08:00
Wenxuan Zhang 7235949cdf refactor: FORGIT_IGNORE_PAGER etc. (#112) 2020-09-11 16:55:35 +08:00
mirsella d8d530ec50
feat: add FORGIT_IGNORE_PAGER option (#112) 
* added FORGIT_BAT_OPTION to add optional options to bat

* fixed arguments

* removed curly brace  in for fish

* BAT_OPTION to BAT_OPTS

* BAT_OPTION to BAT_OPTS in readme

* changed BAT_OPTS TO BAT_PAGER which is directly the command used to output

* update readme for FORGIT_IGNORE_PAGER
 2020-09-11 16:33:55 +08:00
mirsella e8f32648a6
refactor: prefer using XDG directory (#113) 
* FORGIT_GI_REPO_LOCAL and XDG
if FORGIT_GI_REPO_LOCAL is not already declared, use XDG_CACHE_HOME/.forgit/gi/repos/dvcs/gitignore if declared, and if not declared too, use the the fallback path which is ~/.forgit/gi/repos/dvcs/gitignore

* fixed fish
 2020-09-11 11:02:38 +08:00
Chris Apple 4594e9acf1
Merge pull request #114 from mirsella/bugfix 
fixed fish if .forgit wasn't already existing
 2020-09-10 09:06:58 -07:00
Chris Apple 1b366bb5a4
Changed ! to "not" 2020-09-10 09:05:36 -07:00
mirsella ff0c6fd639 fixed fish if .forgit wasn't already existing 
when using forgit for the first time, the .forgit folder is not
created. forgit::ignore::update, which git glone the repo, was executed
only if the folder existed, so now it execute only if the .forgit don't
exist.

also, there some weird things in the logic with forgit::ignore::update,
some part of the code it not running in any case, since the if test -d
in the fonction is called in a fonction which is called only if the
folder don't exist, or i miss something ?
 2020-09-10 15:14:28 +02:00
Chris Apple 522547af28
Merge pull request #109 from cjappl/git-cherry 
git cherry working in fish shell
 2020-09-03 10:49:58 -07:00
Christopher Apple a732afafb4 git cherry working in fish shell 2020-09-03 10:46:39 -07:00
Wenxuan Zhang 12d5d3c0d1 fish: sync #107 2020-09-02 15:40:02 +08:00
Wenxuan c20e56d3a8
Merge pull request #107 from jsfaint/fix-gclean 
Add missing parameters to fix gclean
 2020-09-02 14:54:49 +08:00
Jia Sui c80cf8c5e1 Add missing parameters to fix gclean 
Without `-f` some file will not be cleaned
 2020-09-02 14:50:03 +08:00
Wenxuan Zhang 9a36f6ea5e refactor: reformat 2020-08-27 11:29:49 +08:00
Wenxuan Zhang 13ca262e67 refactor: improve git-cherry-pick style 2020-08-27 11:29:49 +08:00
Jia Sui 3166756079
feat: add cherry-pick support (#106) 
* Add cherry-pick support

* Fix shellcheck warnings
 2020-08-27 11:02:43 +08:00
Kalle Jillheden e0573975ef feat: configurable pager 
Former-commit-id: c91135251b74851241e453b460150c6bdf20170f
 2020-08-21 16:03:32 +08:00
Chris Apple 675eeff917 Merge pull request #104 from cjappl/master 
added fish support for git show+diff pager

Former-commit-id: 4eab7e16f4
 2020-08-12 09:45:08 -07:00
Christopher Apple 8061fb3594 added fish support for git show+diff pager 
Former-commit-id: 3d3ef5336e
 2020-08-12 09:42:35 -07:00
Wenxuan Zhang e69def2cbe ci: add shellcheck 
Former-commit-id: 5698137887
 2020-08-11 17:53:40 +08:00
Wenxuan Zhang b37ebeda9c doc: add ci badge 
Former-commit-id: a3736afb3c
 2020-08-11 17:42:56 +08:00
Wenxuan Zhang 0dc91503d9 ci: fix old fish version 
Former-commit-id: 2f286ef785
 2020-08-11 17:31:08 +08:00
Wenxuan Zhang f2b8166a40 ci: add version info 
Former-commit-id: 2d48dde0b3
 2020-08-11 17:16:16 +08:00
Wenxuan Zhang 428ed11618 ci: split 
Former-commit-id: fea7771a0c
 2020-08-11 17:08:40 +08:00
Wenxuan Zhang 959052aabf ci: fix prerequisites 
Former-commit-id: 74858434a8
 2020-08-11 17:02:57 +08:00
Wenxuan Zhang 0011eb4f13 ci: add github actions ci 
Former-commit-id: 75441a90a8
 2020-08-11 16:56:23 +08:00
Wenxuan Zhang 26162132ca refactor: predefine pagers. #103 
Former-commit-id: 352cc996c8
 2020-08-08 15:36:07 +08:00
Wenxuan c8629a3cd5 Merge pull request #103 from vedang/feature/handle-pager-attribute 
handle git pager attribute.

Former-commit-id: 7de25d9fc1
 2020-08-08 15:28:55 +08:00
Vedang Manerikar e4d35c31ab Handle .gitconfig pager attribute. 
The existing script handles the `core.pager` attribute, but does not
account for the `pager` attribute in git-config. Tools like
`diff-highlight` which ship with git recommend using the `pager`
attribute, and provide beautiful diffs.

I've made minor changes in the script to use these configuration
parameters if they are defined.

Ref: https://github.com/git/git/tree/master/contrib/diff-highlight

Former-commit-id: d41375abdd
 2020-08-08 12:08:42 +05:30
Wenxuan Zhang cac5976435 docs: misc 
Former-commit-id: 57224696a9
 2020-08-05 11:45:55 +08:00
Wenxuan Zhang 6dfd086244 docs: add descriptions. close #102 
Former-commit-id: 64c93ae585
 2020-08-05 11:12:27 +08:00
Wenxuan Zhang 575815dfed ci: update stale.yml 
Former-commit-id: 938a795f61
 2020-08-01 22:15:17 +08:00
Wenxuan Zhang 0f2a902cdc ci: add stale.yml 
Former-commit-id: c369b6c2d9
 2020-08-01 21:58:20 +08:00
Chris Apple 3d22a09e8a Merge pull request #99 from cjappl/add-btab-to-readme 
added toggle mark move down to README

Former-commit-id: 3eee947171
 2020-07-02 08:41:16 -07:00