-
-
Notifications
You must be signed in to change notification settings - Fork 49
Document diff appearance and Git coloring #150
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
824b357
to
e5c994f
Compare
source/settings.rst
Outdated
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. |
There was a problem hiding this comment.
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...
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
Have a look at the changes I have pushed. I think that fixes some issues... |
422d46e
to
665eb37
Compare
Thanks. I aligned the links to Git documentation some more, but did not add the anchors to the display test for the others. |
Reminder about this pr that describes some changes in master. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My 2ct: 👍
Cleaned up the commits, the latest updates had been pushed to #151 (separately approved) |
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...