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

182 commits

Author SHA1 Message Date
wallace 2aaa8fb6af Add missing support for FORGIT_GLO_FORMAT 2022-02-23 20:58:59 +02:00
sandroid ce19cc80ec
Added gct 2022-02-12 22:37:39 +01:00
Wenxuan Zhang 5d15fd3532
refactor: ci lint 2021-10-26 18:40:26 +08:00
Wenxuan eb6db722cd
Merge pull request #164 from wren/git-forgit-147 2021-10-22 10:41:00 +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
Jonathan Wren df36068105 add some comments for clarification 2021-10-17 23:36:16 -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
Wenxuan Zhang 2db37aa4ec
feat: track the remote when possible #153 2021-06-02 13:00:51 +08:00
Wenxuan Zhang d5e0fd86e9
refactor: replace $* with $@ 
ref: 7c1d3b859e (commitcomment-50792390) (thanks @ytian81)
 2021-05-14 10:18:48 +08:00
Wenxuan Zhang 7c1d3b859e
feat: add gco to checkout a commit 2021-04-07 17:23:00 +08:00
Chris Apple 81c35227cb
feat: implement gfu for fish (#149) 
* first attempt at fish gfu

* small tweak for test

* First commit

* Second commit

* fixup! First commit

* fixup! First commit

* removing test files

* Fixing typo after testing

* fixup! First commit

* Fix bug in original implementation

* fixup! First commit

* removing test file

* Commit 1 test

* Commit 2 test

* Finished fish implementation
 2021-04-07 08:37:21 +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
rlanore 416ac0308f
fix: fix reset parameter in FORGIT_LOG_FORMAT default value (#145) 
* Fix reset color int FORGIT_LOG_FORMAT default value

* Fix FORGIT_LOG_FORMAT default doc
 2021-03-25 20:55:46 +08:00
rlanore 8538c052bf
feat: support custom git log format (#143) 
* Add option to git log format tunnable

* Add FORGIT_LOG_FORMAT doc

* Fix shellchecks

* rename options misc

Co-authored-by: Wenxuan Zhang <wenxuangm@gmail.com>
 2021-03-25 11:15:18 +08:00
Christopher Apple 74724a80cb Moved to new argument names version of arg parsing 2021-03-12 13:15:48 -08:00
Carlos de Paula 3faab44f66 Use argument to create new branch on gcb 2021-03-12 12:58:50 -08:00
Wenxuan Zhang 15383e6b4d
fix: fix copy without newline (#141) 
Don't known why `tr -d '\n'` inner fzf options doesn't work.
Use `tr -d '[:space:]'` instead. It's OK for this scenario.
 2021-03-10 10:01:20 +08:00
Wenxuan Zhang 29bc286228
fix: improve compatibility for vim (#138) 2021-03-08 10:39:19 +08:00
Chris Apple 7b18caa340
Fish checkout branch - updated internal function names to checkout::file and checkout::branch (#134) 
* Initial commit, gcb working and function names fixed

* Fixing indentation
 2021-02-18 11:51:54 +08:00
Yiannis 4cd46818a5
feat: add gcb to switch branches in a repo (#131 #26 #101) 
I added `gcb` which is used to list all the branches and checkout into
one of your choice. I believe this is a useful functionality especially
when a repo has too many branches to rememmber and lookup.

The preview shows the log graph from the selected branch.
I have removed keybinding for copy commit hash on gcb alias

Signed-off-by: b10n1k <jbonatakis@gmail.com>
 2021-02-07 18:21:51 +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
Wenxuan Zhang 95526b3130
refactor: replace "-R" with "-r" for less pager 2020-11-11 19:36:14 +08:00
Wenxuan Zhang 968d362997
feat: add forgit::rebase function 2020-11-03 15:47:11 +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
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
Wenxuan Zhang e69def2cbe ci: add shellcheck 
Former-commit-id: 5698137887
 2020-08-11 17:53:40 +08:00
Wenxuan Zhang 26162132ca refactor: predefine pagers. #103 
Former-commit-id: 352cc996c8
 2020-08-08 15:36:07 +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
Christopher Apple 8ad950db00 fixed gcf, and a bunch of other things. Added git status before most returns 
Former-commit-id: 896a960a03
 2020-06-13 10:59:47 -07:00
Wenxuan Zhang 2170e5b3b9 feat: try to suppress global '-1' option for fzf 
Use '+1' to suppress '-1' option set by `FZF_DEFAULT_OPTS`.
This is a undocumented option for `fzf`. There is no guarantee that it
will always work. It's better to not set such options in
`FZF_DEFAULT_OPTS` which are not globally applicable. #80


Former-commit-id: 1f1e135b9f
 2020-05-07 19:38:54 +08:00
Wenxuan Zhang e1f8ef8459 docs: add comment 
Former-commit-id: 801e137d71
 2020-04-17 12:35:43 +08:00
Wenxuan Zhang 9f0c261680 feat: support commit ref parameters for glo. #85 
Former-commit-id: bd67dcbddd
 2020-04-17 12:29:39 +08:00
Wenxuan Zhang ccfded75fd fix: fix preview error on gss. #74 
Former-commit-id: a5da0127c7
 2020-04-09 11:02:58 +08:00
Wenxuan Zhang c96b426f2b fix: fix preview error on gd. #74 
Former-commit-id: d0f09565e0
 2020-04-08 10:45:18 +08:00
Wenxuan Zhang 3c82bcf7ac feat: add an option to turn off the log graph. 
Former-commit-id: 168d9c1d19
 2020-03-29 16:28:24 +08:00
nothingelsematters efb93423b7 fzf preview bug fixed x2 
Former-commit-id: 9cdb037551
 2020-03-22 22:10:59 +08:00
nothingelsematters de07813e07 fzf preview bug fixed 
Former-commit-id: ee52d21952
 2020-03-22 22:10:59 +08:00
Wenxuan Zhang 7505b82a1d fix: 🐛 Fix issue on ga when path contains blanks 
Former-commit-id: 4eb0832e53
 2020-01-15 15:30:52 +08:00
Wenxuan Zhang b5ef8632e2 Refactor 
Former-commit-id: fa3303b432
 2020-01-14 22:36:52 +08:00
Carlos de Paula e73cef6856 Add files as arguments 
Add case where "ga" command can accept files as arguments
that will be passed directly to "git add" bypassing fzf.


Former-commit-id: 0c6199b8cd
 2020-01-14 22:10:40 +08:00
Wenxuan Zhang c573ce4d10 feat: 🎸 Improve diff preview on untracked files for ga. #66 
Former-commit-id: 1cdc643e84
 2019-12-22 12:14:06 +08:00
Wenxuan Zhang d4285f3ea9 fix: 🐛 Fix path issue on osx. #65 
Former-commit-id: 10308be2c3
 2019-12-17 11:46:15 +08:00
Wenxuan Zhang fdec1c9f81 style: 💄 refactor xargs parameter format 
Former-commit-id: 779e8b4d36
 2019-11-26 18:42:22 +08:00
Wenxuan Zhang 59d3884d96 fix: 🐛 fix more whitespace related bugs 
Former-commit-id: 0de4c2c91f
 2019-11-26 18:40:03 +08:00
Wenxuan Zhang 7dda409ee9 fix: 🐛 Fix bug when path contains blanks 
Former-commit-id: 724d507e5d
 2019-11-23 12:02:41 +08:00
Wenxuan Zhang b246d34799 fix: 🐛 Fix path error on deleted files 
BREAKING CHANGE: 🧨 Paths listed by forgit::diff will use repo's root as start point.


Former-commit-id: 90e9235778
 2019-11-23 12:02:41 +08:00
Wenxuan Zhang 263163f53e fix: 🐛 No necessary to check if fzf exists during loading. #57 
Former-commit-id: add3a02ebb
 2019-11-22 17:52:09 +08:00
Benjamin Caradeuc b9800cb4d0 🐛 fix typo in warning message 
Former-commit-id: 903fba2c2f
 2019-11-20 23:46:45 +01:00
Wenxuan Zhang 47d52e1552 feat: 🎸 Read git's pager configuration. #51 
Former-commit-id: 1054326ff6
 2019-11-11 18:06:28 +08:00
Laur Aliste b2e3f6c35c fix shell error in forgit.plugin.zsh 
Former-commit-id: 6255d8b405
 2019-11-06 13:12:27 +01:00
Christopher Apple ad76f6259c Moved warning for no fzf to forgit::warn 
Former-commit-id: 325e98cd03
 2019-11-05 20:06:45 -07:00
Christopher Apple db619daa6e Fixed readme and added fzf check to zsh to be the same as fish version 
Former-commit-id: 4ab5a2daae
 2019-11-05 08:54:29 -07:00
Wenxuan Zhang eb2295b06e fix: 🐛 Fix darwin compatibility on gd. #39 
Former-commit-id: b7ef3ac3eb
 2019-10-24 11:27:36 +08:00
Wenxuan Zhang 760fe56428 fix: 🐛 Fix relative path issue on forgit::diff 
Former-commit-id: e1418c0402
 2019-10-22 12:28:55 +08:00
Gerrit Kieffer 36806008a2 Added -q flag for git reset HEAD 
Former-commit-id: fce64385df
 2019-08-26 09:13:40 +02:00
Gerrit Kieffer cfc0a49d8c fix: 🐛 Fix relative path issue in add and reset head. #30 
Former-commit-id: 3eff37d931
 2019-08-25 11:27:12 +02:00
Wenxuan Zhang 06e5a57eb7 feat: 🎸 Do not emojify on diff content 
Former-commit-id: 02822e2fe9
 2019-08-17 11:16:32 +08:00
Wenxuan Zhang 9003f278df fix: 🐛 Fix relative path issue in diff. #29 
Former-commit-id: 3b36db0153
 2019-08-07 16:39:31 +08:00
Wenxuan Zhang e3ba18d29e feat: 🎸 Support diff with given commit (and paths).#27 
Former-commit-id: 631cca8c12
 2019-08-03 11:59:20 +08:00
Nattaphoom Chaipreecha b2fbca2275 Add grh command for git reset HEAD (unstage) 
Former-commit-id: 0b52a28ab0
 2019-07-05 23:06:46 +07:00
Wenxuan Zhang faad05c65a fix: 🐛 Fix copy keybind 
Former-commit-id: c1666a4270
 2019-05-30 18:22:18 +08:00
Wenxuan Zhang d2d1ab76c7 Support multiple lines fzf opts. 
Former-commit-id: 0d542fb3f4
 2019-05-29 18:11:11 +08:00
Wenxuan Zhang c5f9fd611e Bug fix. 
Former-commit-id: a93657c1fc
 2019-05-29 16:39:04 +08:00
Doron Behar e15849c990 Add documentation and align it with actual functionality 
Former-commit-id: 827d1e56a3
 2019-05-29 09:32:17 +03:00
Doron Behar e766a62ed5 Use a more general usage env vars to add opts 
Former-commit-id: bd48b08e4a
 2019-05-29 09:25:30 +03:00
Doron Behar 908bcdb548 Fix some more bindings and preview commands 
Former-commit-id: cf54db9c72
 2019-05-29 06:39:43 +03:00
Doron Behar dc203d70c2 Enable configuring preview command for every cmd 
Former-commit-id: b6f1476d86
 2019-05-28 15:41:45 +03:00
Wenxuan Zhang b48856e98a Support custom gitignore templates repo. #20 
Former-commit-id: 7459ba7cda
 2019-03-14 14:15:05 +08:00
Wenxuan Zhang 2b9aaa594f Remove theme & style config for bat. 
Former-commit-id: 3c7b9ea4b8
 2019-01-22 15:53:40 +08:00
Wenxuan aafb2bca05 Fix bat url refer comment. 
Former-commit-id: 9651acbef2
 2019-01-22 12:01:12 +08:00
Wenxuan cf9a37aed7 Update keybinds table. 
Former-commit-id: 28d55baf67
 2019-01-22 11:58:47 +08:00
Wenxuan ff58ec2900 Clean up. 
Former-commit-id: ee79b779fd
 2019-01-22 11:25:38 +08:00
Wenxuan 1259c09a46 Respect user's config for bat. 
Former-commit-id: 1b0254a7c6
 2019-01-21 11:39:32 +08:00
Wenxuan c0d82c551c Respect user's config for bat(except style). 
Former-commit-id: 8a647a9cea
 2019-01-21 11:33:31 +08:00
Wenxuan 4123a2a582 Fix function name. 
Former-commit-id: 2463d767fc
 2019-01-21 11:00:45 +08:00
Wenxuan cd3ba29ad1 Feature: Remove option list on gi. #16 
Former-commit-id: 7c0da36ba7
 2019-01-18 17:52:52 +08:00
Wenxuan 1802ec26fc Update README 
Former-commit-id: 99b3c66cd6
 2019-01-18 17:41:15 +08:00
Wenxuan 877b153a20 Specified a better bat theme for gitignore 
Former-commit-id: 99c973a3a1
 2019-01-18 17:19:22 +08:00
Wenxuan 32fe86131a Feature: Add highlight support for gi. 
Former-commit-id: 92e64772f7
 2019-01-18 16:59:35 +08:00
Wenxuan e2776a28e2 Feature: Support templates not ending with .gitignore 
Former-commit-id: 126453c777
 2019-01-18 16:11:53 +08:00
Wenxuan 34a2133524 Fix a bug which ignoring the files with link type. 
Former-commit-id: babb299206
 2019-01-18 15:48:56 +08:00
Wenxuan eb110c636f Update LICENSE. 
Former-commit-id: 947954ea84
 2019-01-18 15:06:27 +08:00
Wenxuan 1567cdfdbf Improve git color process logic. #15 
Former-commit-id: c14ce9312a
 2019-01-18 14:55:55 +08:00
Wenxuan 7159c756d1 Avoid variables polluting env. 
Former-commit-id: 621676feb2
 2019-01-18 12:23:24 +08:00
Wenxuan b6b509a306 Improving logging message. 
Former-commit-id: ac6e61d692
 2019-01-17 20:44:24 +08:00
Wenxuan 80fe6ac4a6 Refactor & Share code between zsh & sh. 
Former-commit-id: 268c6282cb
 2019-01-17 19:20:03 +08:00