mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-31 15:30:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #473 from waldyrious/patch-1

Browse source 
commands.js: add --force alias to the -f option (fix #472)
This commit is contained in:
Peter Cottle 2018-07-10 12:15:32 -07:00 • committed by GitHub
commit 7637eb9139
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/git/commands.js
View file

@ -413,6 +413,7 @@ var commandConfig = {
'-d', '-d',
'-D', '-D',
'-f', '-f',
'--force',
'-a', '-a',
'-r', '-r',
'-u', '-u',
@ -458,8 +459,9 @@ var commandConfig = {
return; return;
} }
if (commandOptions['-f']) { if (commandOptions['-f'] || commandOptions['--force']) {
args = commandOptions['-f'].concat(generalArgs); args = commandOptions['-f'] || commandOptions['--force'];
args = args.concat(generalArgs);
command.twoArgsImpliedHead(args, '-f'); command.twoArgsImpliedHead(args, '-f');
// we want to force a branch somewhere // we want to force a branch somewhere