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

joaomoreno · joaomoreno · commit fa1deaaa34df · 2018-09-12T12:01:51.000+02:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -1051,6 +1051,12 @@
           "description": "%config.showProgress%",
           "default": true,
           "scope": "resource"
+        },
+        "git.syncRebase": {
+          "type": "boolean",
+          "scope": "resource",
+          "default": false,
+          "description": "%config.syncRebase%"
         }
       }
     },
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
@@ -88,6 +88,7 @@
 	"config.alwaysSignOff": "Controls the signoff flag for all commits.",
 	"config.ignoredRepositories": "List of git repositories to ignore.",
 	"config.showProgress": "Controls whether git actions should show progress.",
+	"config.syncRebase": "Synchronize changes using rebase.",
 	"colors.modified": "Color for modified resources.",
 	"colors.deleted": "Color for deleted resources.",
 	"colors.untracked": "Color for untracked resources.",
diff --git a/extensions/git/src/statusbar.ts b/extensions/git/src/statusbar.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { Disposable, Command, EventEmitter, Event } from 'vscode';
+import { Disposable, Command, EventEmitter, Event, workspace } from 'vscode';
 import { Repository, Operation } from './repository';
 import { anyEvent, dispose } from './util';
 import * as nls from 'vscode-nls';
@@ -100,10 +100,18 @@ class SyncStatusBar {
 
 		if (HEAD && HEAD.name && HEAD.commit) {
 			if (HEAD.upstream) {
+				const config = workspace.getConfiguration('git');
+				const gitSyncRebase = config.get<string>('syncRebase');
+
 				if (HEAD.ahead || HEAD.behind) {
 					text += this.repository.syncLabel;
 				}
-				command = 'git.sync';
+
+				if (gitSyncRebase) {
+					command = 'git.syncRebase';
+				} else {
+					command = 'git.sync';
+				}
 				tooltip = localize('sync changes', "Synchronize Changes");
 			} else {
 				icon = '$(cloud-upload)';

Original file line number	Diff line number	Diff line change
`@@ -1051,6 +1051,12 @@`
`1051`	`1051`	`"description": "%config.showProgress%",`
`1052`	`1052`	`"default": true,`
`1053`	`1053`	`"scope": "resource"`
	`1054`	`+ },`
	`1055`	`+ "git.syncRebase": {`
	`1056`	`+ "type": "boolean",`
	`1057`	`+ "scope": "resource",`
	`1058`	`+ "default": false,`
	`1059`	`+ "description": "%config.syncRebase%"`
`1054`	`1060`	`}`
`1055`	`1061`	`}`
`1056`	`1062`	`},`