Skip to content

Conversation

gerhardol
Copy link
Member

Basically what was implemented in gitextensions/gitextensions#11677
and gitextensions/gitextensions#11590

See build in https://git-extensions-documentation.readthedocs.io/en/tmp-4.3/settings.html#diff-appearance
(with a few additional changes).

@pmiossec suggested the UI was updated, it may be a followup. I prefer to merge this PR first though...

@pmiossec pmiossec force-pushed the feature/diff-appearance branch from 824b357 to e5c994f Compare April 29, 2024 10:21
The appearance uses Git word diff as described in `GitDiff#--word-diff <https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---word-diffltmodegt>`_

This is not a "patch" view, and so cannot be used to apply line patches.
It is intended as a contrast to the default view why Git default view is changed to show a minimal diff.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this sentence should be rewritten...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Read it again and again and I still don't get the sense of this sentence 😕

Is It is intended, as a contrast to the default view, to show a minimal diff. not good enough?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that is better, will change.

@pmiossec
Copy link
Member

Have a look at the changes I have pushed. I think that fixes some issues...

@gerhardol gerhardol force-pushed the feature/diff-appearance branch from 422d46e to 665eb37 Compare April 29, 2024 20:04
@gerhardol
Copy link
Member Author

Have a look at the changes I have pushed. I think that fixes some issues...

Thanks. I aligned the links to Git documentation some more, but did not add the anchors to the display test for the others.
Instead of your GitDiff display text I changed to the existing use of "git diff", could be git-diff too (as in the url).

@gerhardol
Copy link
Member Author

Reminder about this pr that describes some changes in master.
@gitextensions/git-extensions-source

Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My 2ct: 👍

@gerhardol
Copy link
Member Author

Cleaned up the commits, the latest updates had been pushed to #151 (separately approved)

@gerhardol gerhardol merged commit a6f53b5 into main Aug 9, 2024
@gerhardol gerhardol deleted the feature/diff-appearance branch August 9, 2024 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants