mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-20 10:46:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updates

Browse source
This commit is contained in:
Peter Cottle 2012-09-14 21:58:07 -07:00
parent a93a16f06f
commit 95277013e5
2 changed files with 61 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commandline.js
View file

@ -156,7 +156,7 @@ OptionParser.prototype.getMasterOptionMap = function() {
},
reset: {
'--hard': false,
'--soft': false, // this will raise and error but we catch it in gitEngine
'--soft': false, // this will raise an error but we catch it in gitEngine
},
merge: {},
rebase: {},