Manage Pods, Containers and Container Images
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> |
||
|---|---|---|
| .gitignore | ||
| podman.spec | ||
| sources | ||