Combining bundle and git