Lukas Fleischer 於 西元2015年07月23日 16:13 寫道:
On Thu, 23 Jul 2015 at 09:45:46, Ting-Wei Lan wrote:
I forgot 'git push --force' was no longer allowed in AUR4. I forgot to
include .SRCINFO changes in the last commit, and I can no longer do 'git
subtree push' to fix it because the pushed commit was rebased. I cannot
use 'git reflog' and 'git reset' to go back to the old commit because I
have pushed changes to other packages after rebasing. It seems the only
way to fix it myself is doing 'git subtree pull', but it will cause the
history become very ugly.
[...]
I haven't used Git subtrees a lot but can't you simply rewrite the
history of your "super repository" (e.g. using `git rebase -i`) and drop
the latest `git subtree pull` import of the package base, then add a
fixup commit that adds the .SRCINFO and run `git subtree pull` once
again?
The first 'git subtree pull' creates a very ugly merge commit that
causes every mingw-w64-gtk3 changes to be showed twice in my 'super
repository'.
