The Wayback Machine - https://web.archive.org/web/20210617004927/https://github.com/laravel/framework/pull/34898
Skip to content

/ framework

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

Jump to bottom

[8.x] Explicitly set hunk diffing #34898

Merged
merged 3 commits into from Oct 20, 2020
Merged

[8.x] Explicitly set hunk diffing #34898

merged 3 commits into from Oct 20, 2020

Conversation

@jbrooksuk
Copy link
Member

@jbrooksuk jbrooksuk commented Oct 20, 2020

Taken from what I learnt at https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more

This improves the hunk diffing when using git diff.
@jbrooksuk
Explicitly set hunk diffing of PHP and Markdown files
c643086
@jbrooksuk jbrooksuk changed the title Explicitly set hunk diffing of PHP and Markdown files [8.x] Explicitly set hunk diffing of PHP and Markdown files Oct 20, 2020
@jbrooksuk
Add Blade, HTML and CSS
bb49205
@jbrooksuk jbrooksuk changed the title [8.x] Explicitly set hunk diffing of PHP and Markdown files [8.x] Explicitly set hunk diffing Oct 20, 2020
@driesvints
driesvints reviewed Oct 20, 2020
View changes
.gitattributes Show resolved Hide resolved
@jbrooksuk
Sort
4b156d3
@driesvints
driesvints approved these changes Oct 20, 2020
View changes
@taylorotwell taylorotwell merged commit 1d5792f into 8.x Oct 20, 2020
14 checks passed
14 checks passed
@github-actions
PHP 7.3 - prefer-lowest
Details
@github-actions
PHP 7.3 - prefer-lowest
Details
@github-actions
PHP 7.3 - prefer-stable
Details
@github-actions
PHP 7.3 - prefer-stable
Details
@github-actions
PHP 7.4 - prefer-lowest
Details
@github-actions
PHP 7.4 - prefer-lowest
Details
@github-actions
PHP 7.4 - prefer-stable
Details
@github-actions
PHP 7.4 - prefer-stable
Details
@github-actions
PHP 7.3 - prefer-lowest - Windows
Details
@github-actions
PHP 7.3 - prefer-lowest - Windows
Details
@github-actions
PHP 7.4 - prefer-stable - Windows
Details
@github-actions
PHP 7.4 - prefer-stable - Windows
Details
continuous-integration/styleci/pr The analysis has passed
Details
continuous-integration/styleci/push The analysis has passed
Details
@driesvints driesvints deleted the git-attributes-diffing branch Oct 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@driesvints driesvints

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@jbrooksuk @driesvints @taylorotwell