Merge commit 'refs/pull/61149/head' of github.com:Microsoft/vscode into pr/61149

extensions/git/src/api/git.d.ts

@@ -26,6 +26,11 @@ export interface Ref {
 	readonly remote?: string;
 }
 
+export interface TrackingShip {
+	readonly local: string;
+	readonly upstream: string;
+}
+
 export interface UpstreamRef {
 	readonly remote: string;
 	readonly name: string;
@@ -235,4 +240,4 @@ export const enum GitErrorCodes {
 	CantRebaseMultipleBranches = 'CantRebaseMultipleBranches',
 	PatchDoesNotApply = 'PatchDoesNotApply',
 	NoPathFound = 'NoPathFound'
-}
+}