[Bug 252132] mergemaster: needs to cope with empty $FreeBSD$ tags or /etc files must have $FreeBSD: number$

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252132

Marek Zarychta <zarychtam at plan-b.pwste.edu.pl> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |zarychtam at plan-b.pwste.edu.
                   |                            |pl

--- Comment #2 from Marek Zarychta <zarychtam at plan-b.pwste.edu.pl> ---
(In reply to Anton Saietskii from comment #1)

No worries. I was told that mergemaster(8) is on its way out, but
$FreeBSD$ IDs can be regenerated in the local Git repository with clean/smudge
filters. With them applied, "mergemaster -UFi" still works fine and also the
administrator is able to better track the updates.

More info on configuring the filters can be found here:
https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes

-- 
You are receiving this mail because:
You are the assignee for the bug.