Gh371 git staging

use switch