Skip to content
This repository was archived by the owner on Oct 9, 2024. It is now read-only.

Improve how Git treats changelog and locks in diffs #12

Merged
merged 3 commits into from
Sep 10, 2021
Merged

Improve how Git treats changelog and locks in diffs #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44b2e24
Indent the autotext gitattributes setup
webknjaz Sep 8, 2021
856069b
Let Git know to merge everything into changelog
webknjaz Sep 8, 2021
a2b6217
Set up nicer previews for meta changes
webknjaz Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Set default behavior to automatically normalize line endings.
* text=auto
* text=auto

CHANGELOG.md merge=union

*.lock text -diff
package.json text eol=lf
package-lock.json text -diff
yarn.lock text -diff