Replace 'tracking' (deprecated) with 'upstream' option for push behavior