Closed carlfriedrich closed 1 year ago
Will you do us a favor and attach a screenshot of before and after?
It can be useful in documenting how things are supposed to perform in case of bugs!
Appreciate all of your submissions recently :)
On Sun, Jul 17, 2022 at 7:44 AM, Tim @.***> wrote:
While we can see the compact diff in the preview window on gd, I find it useful to see the complete file when entering the diff. Set the diff context to 10000 for this purpose.
Furthermore, display the diff range in the fzf prompt to see what we're looking at. With the normal git diff this is part of the diff output anyway, but with diff-so-fancy it's not, so this should be useful.
Check list
- I have performed a self-review of my code
- I have commented my code in hard-to-understand areas
- I have made corresponding changes to the documentation
Description
Type of change
- Bug fix
- New feature
- Refactor
- Breaking change
- Documentation change
Test environment
Shell
bash
zsh
fish
OS
Linux
Mac OS X
Windows
Others:
You can view, comment on, or merge this pull request online at:
https://github.com/wfxr/forgit/pull/221
Commit Summary
- bb4514a Improve forgit::diff
File Changes
(2 files)
- M conf.d/forgit.plugin.fish (11)
- M forgit.plugin.zsh (10)
Patch Links:
— Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you are subscribed to this thread.Message ID: @.***>
@cjappl Sure! I have updated the PR description with screenshots.
@carlfriedrich LGTM!
I have renamed the option name and applied this feature to forgit::log
(bash / zsh) as well based on your commits. Can you help finish the fish
part?
@wfxr Thanks! I have applied this to fish and squashed your commits into mine.
@wfxr Thanks for merging!
While we can see the compact diff in the preview window on
gd
, I find it useful to see the complete file when entering the diff. Set the diff context to 10000 for this purpose.Before:![grafik](https://user-images.githubusercontent.com/45259958/179527882-95f83ae9-041e-4ac7-a8a0-5b51c9ecd11f.png)
After:![grafik](https://user-images.githubusercontent.com/45259958/179526908-d54538f0-b391-4c58-95b4-c7038857610d.png)
Furthermore, display the diff range in the fzf prompt to see what we're looking at. With the normal
git diff
this is part of the diff output anyway, but withdiff-so-fancy
it's not, so this should be useful.Before:![grafik](https://user-images.githubusercontent.com/45259958/179525925-b5beb4a5-1372-4184-a543-6589f97367b2.png)
After:![grafik](https://user-images.githubusercontent.com/45259958/179526499-e1acdf34-0d05-4102-8224-3ba15e88632a.png)
Check list
Description
Type of change
Test environment