summaryrefslogtreecommitdiff
path: root/src/backend/killemerge.py
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-17 23:10:18 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-17 23:10:18 +0100
commit46bdb849165a511fbf0efb87cc5c9f34e0a87d8e (patch)
treef61955d270e871393bbf6ffd81a3c6c69c43bf44 /src/backend/killemerge.py
parentf37a767ba3a4326502eb7ebb29c3e7621b0a480b (diff)
bugfix :
* git reset --hard is a bit overkill for portage config files sync as it will reset MAKEOPTS, custom USE flags, keywords, masks etc * to preserve them, use git stash right before the hard reset, and then apply the stash
Diffstat (limited to 'src/backend/killemerge.py')
0 files changed, 0 insertions, 0 deletions