Merge "Use git package instead of obsolete git-core"