Page MenuHomeFreeBSD

.gitignore: remove .orig/.rej
Needs RevisionPublic

Authored by melifaro on Feb 11 2022, 8:04 PM.

Details

Summary

Records to ignore .orig/.rej were added in b1f7154cb125.
It turns out that some currently-used developer workflows rely on git reporting .rej files after the merges.
As there is no easy is no easy way to override project .gitignore files locally, remove these records from our .gitignore.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 44418
Build 41306: arc lint + arc unit

Event Timeline

This revision is now accepted and ready to land.Feb 11 2022, 9:23 PM
cem requested changes to this revision.Feb 11 2022, 10:53 PM

What workflow?

This revision now requires changes to proceed.Feb 11 2022, 10:53 PM

I don't mind this change either way but I also wonder what kind of workflows need Git to report .orig/.rej.

The workflow I'm referring to is easily cleaning up after applying patches with git clean, using standard arguments.