Merge diverged dist-git history to restore fast-forward sync

Browse Source

The dist-git branch diverged from CentOS Stream around July 9-30 when
the nil pointer dereference fix (RHEL-166084) was applied independently
on both branches with different source tarballs (5126ff2 on dist-git vs
7440736 on CentOS Stream). This merge uses strategy 'ours' to keep the
CentOS Stream content unchanged while incorporating the dist-git history
as a parent, re-enabling fast-forward sync from CentOS Stream to dist-git.

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

...

This commit is contained in:

Jindrich Novy 2026-08-20 13:21:35 +02:00

parent adf49d72af 4d6ad3b192

commit a5f1461056

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available