mirror of https://github.com/containers/podman.git
82f2b3edbc
The use of 'C^' (parent) in 'git rebase' is counterintuitive, at least to me: when C is a merge of multiple commits, rebase picks each of those commits. That probably makes good sense to a git expert, which I'm not. Solution: forget using '^', just calculate the baseline sizes by doing a checkout of the PR's parent. Also: compute PR parent using git-merge-base instead of blindly trusting $DEST_BRANCH (which may be volatile as other PRs are merged). Also: run git-rebase directly, not via make rule. That indirection is too confusing here. Signed-off-by: Ed Santiago <santiago@redhat.com> |
||
|---|---|---|
| .. | ||
| cirrus | ||
| containers-common | ||
| hello | ||
| modules-load.d | ||
| msi | ||
| podmanimage | ||
| remote | ||
| script | ||
| snapcraft | ||
| spec | ||
| systemd | ||
| tmpfile | ||
| dependabot-dance | ||
| dependencies.txt | ||