logburn/git-utilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release: remove merge override

Browse Source
This commit is contained in:
rkiel
2017-09-20 22:33:13 -04:00
parent c410028f50
commit 209fcac14d
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
FEATURE.md
View File

@@ -79,12 +79,6 @@ Use the `merge` subcommand to merge your feature branch changes to the standard
feature merge feature merge
``` ```
You can also override the default standard branch by specifying another branch.
```
feature merge integration
```
#### End #### End
Use the `end` subcommand to safely close out the feature. Use the `end` subcommand to safely close out the feature.

4
lib/feature/merge.rb
View File

@@ -4,11 +4,11 @@ module Feature
class Merge < Feature::Base class Merge < Feature::Base
def valid? def valid?
[1,2].include? argv.size [1].include? argv.size
end end
def help def help
"feature merge [branch]" "feature merge"
end end
def execute def execute