mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-08-31 15:30:56 +02:00
Merge pull request #473 from waldyrious/patch-1
commands.js: add --force alias to the -f option (fix #472)
This commit is contained in:
commit
7637eb9139
1 changed files with 4 additions and 2 deletions
|
@ -413,6 +413,7 @@ var commandConfig = {
|
|||
'-d',
|
||||
'-D',
|
||||
'-f',
|
||||
'--force',
|
||||
'-a',
|
||||
'-r',
|
||||
'-u',
|
||||
|
@ -458,8 +459,9 @@ var commandConfig = {
|
|||
return;
|
||||
}
|
||||
|
||||
if (commandOptions['-f']) {
|
||||
args = commandOptions['-f'].concat(generalArgs);
|
||||
if (commandOptions['-f'] || commandOptions['--force']) {
|
||||
args = commandOptions['-f'] || commandOptions['--force'];
|
||||
args = args.concat(generalArgs);
|
||||
command.twoArgsImpliedHead(args, '-f');
|
||||
|
||||
// we want to force a branch somewhere
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue