mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-14 16:44:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #475 from waldyrious/patch-1

Browse source 
commands.js: add --all alias to the -a option
This commit is contained in:
Peter Cottle 2018-07-10 14:38:52 -07:00 • committed by GitHub
commit f209012149
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,6 +121,7 @@ var commandConfig = {
options: [
'--amend',
'-a',
'--all',
'-am',
'-m'
],
@ -129,7 +130,7 @@ var commandConfig = {
command.acceptNoGeneralArgs();
if (commandOptions['-am'] && (
commandOptions['-a'] || commandOptions['-m'])) {
commandOptions['-a'] || commandOptions['--all'] || commandOptions['-m'])) {
throw new GitError({
msg: intl.str('git-error-options')
});
@ -137,7 +138,7 @@ var commandConfig = {
var msg = null;
var args = null;
if (commandOptions['-a']) {
if (commandOptions['-a'] || commandOptions['--all']) {
command.addWarning(intl.str('git-warning-add'));
}