Rename discard to force to align with push

src/commandsAndMenu.tsx

@@ -391,19 +391,19 @@ export function addCommands(
   /** Add git pull command */
   commands.addCommand(CommandIDs.gitPull, {
     label: args =>
-      args.discard
+      args.force
         ? trans.__('Pull from Remote (Force)')
         : trans.__('Pull from Remote'),
     caption: args =>
-      args.discard
+      args.force
         ? trans.__(
             'Discard all current changes and pull from remote repository'
           )
         : trans.__('Pull latest code from remote repository'),
     isEnabled: () => gitModel.pathRepository !== null,
     execute: async args => {
       try {
-        if (args.discard) {
+        if (args.force) {
           await discardAllChanges(gitModel, trans, args.fallback as boolean);
         }
         logger.log({
@@ -438,7 +438,7 @@ export function addCommands(
             )
         ) {
           await commands.execute(CommandIDs.gitPull, {
-            discard: true,
+            force: true,
             fallback: true
           });
         } else {
@@ -1197,7 +1197,7 @@ export function createGitMenu(
       menu.addItem({ command, args: { force: true } });
     }
     if (command === CommandIDs.gitPull) {
-      menu.addItem({ command, args: { discard: true } });
+      menu.addItem({ command, args: { force: true } });
     }
   });
 

src/components/FileList.tsx

@@ -21,7 +21,7 @@ import { ContextCommandIDs, CommandIDs, Git } from '../tokens';
 import { ActionButton } from './ActionButton';
 import { FileItem } from './FileItem';
 import { GitStage } from './GitStage';
-import { discardAllChanges as _discardAllChanges } from '../widgets/discardAllChanges';
+import { discardAllChanges } from '../widgets/discardAllChanges';
 
 export interface IFileListState {
   selectedFile: Git.IStatusFile | null;
@@ -212,7 +212,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
   /** Discard changes in all unstaged and staged files */
   discardAllChanges = async (event: React.MouseEvent): Promise<void> => {
     event.stopPropagation();
-    await _discardAllChanges(this.props.model, this.props.trans);
+    await discardAllChanges(this.props.model, this.props.trans);
   };
 
   /** Add a specific unstaged file */