diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index cdc048a123449555e7e308166fcf7da8aab98398..1cfd67bd4ab655f78b09b27f1ae998e6cbca8ca4 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -10,7 +10,7 @@ import { Ref, RefType, Git, GitErrorCodes, Branch } from './git';
 import { Repository, Resource, Status, CommitOptions, ResourceGroupType } from './repository';
 import { Model } from './model';
 import { toGitUri, fromGitUri } from './uri';
-import { grep } from './util';
+import { grep, eventToPromise, isDescendant } from './util';
 import { applyLineChanges, intersectDiffWithRange, toLineRanges, invertLineChange } from './staging';
 import * as path from 'path';
 import * as os from 'os';
@@ -939,6 +939,25 @@ export class CommandCenter {
 		getCommitMessage: () => Promise<string | undefined>,
 		opts?: CommitOptions
 	): Promise<boolean> {
+		const unsavedTextDocuments = workspace.textDocuments
+			.filter(d => !d.isUntitled && d.isDirty && isDescendant(repository.root, d.uri.fsPath));
+
+		if (unsavedTextDocuments.length > 0) {
+			const message = unsavedTextDocuments.length === 1
+				? localize('unsaved files single', "The following file is unsaved: {0}.\n\nWould you like to save it before comitting?", path.basename(unsavedTextDocuments[0].uri.fsPath))
+				: localize('unsaved files', "There are {0} unsaved files.\n\nWould you like to save them before comitting?", unsavedTextDocuments.length);
+			const saveAndCommit = localize('save and commit', "Save All & Commit");
+			const commit = localize('commit', "Commit Anyway");
+			const pick = await window.showWarningMessage(message, { modal: true }, saveAndCommit, commit);
+
+			if (pick === saveAndCommit) {
+				await Promise.all(unsavedTextDocuments.map(d => d.save()));
+				await repository.status();
+			} else if (pick !== commit) {
+				return false; // do not commit on cancel
+			}
+		}
+
 		const config = workspace.getConfiguration('git');
 		const enableSmartCommit = config.get<boolean>('enableSmartCommit') === true;
 		const enableCommitSigning = config.get<boolean>('enableCommitSigning') === true;