update git-feature docs

Author: spacewander

Commands.md

@@ -72,7 +72,7 @@ Sets up the `gh-pages` branch.  (See [GitHub Pages](http://pages.github.com/) do
 
 ## git feature|refactor|bug|chore
 
-Create the given feature, refactor, bug or chore branch `name`:
+Create/Merge the given feature, refactor, bug or chore branch `name`:
 
 ```bash
 $ git feature dependencies

man/git-feature.1

@@ -1,18 +1,24 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-FEATURE" "1" "April 2015" "" ""
+.TH "GIT\-FEATURE" "1" "September 2015" "" ""
 .
 .SH "NAME"
-\fBgit\-feature\fR \- Create feature branch
+\fBgit\-feature\fR \- Create/Merge feature branch
 .
 .SH "SYNOPSIS"
-\fBgit\-feature\fR [finish] <name>
+\fBgit\-feature\fR [\-a|\-\-alias branch_prefix] [finish] <name>
 .
 .SH "DESCRIPTION"
-Create the given feature branch
+Create/Merge the given feature branch
 .
 .SH "OPTIONS"
+<\-a|\-\-alias branch_prefix>
+.
+.P
+use \fBbranch_prefix\fR instead of \fBfeature\fR
+.
+.P
 <finish>
 .
 .P
@@ -30,10 +36,16 @@ The name of the feature branch\.
 
 $ git feature dependencies
 \.\.\.
-$ git commit \-m "Some changes"
+$ (feature/dependencies) git commit \-m "Some changes"
 \.\.\.
-$ git checkout master
+$ (feature/dependencies) git checkout master
 $ git feature finish dependencies
+
+$ git alias features "feature \-a features"
+$ git features dependencies
+$ (features/dependencies) \.\.\.
+$ (features/dependencies) git checkout master
+$ git features finish dependencies
 .
 .fi
 .

man/git-feature.1.html

@@ -1,16 +1,20 @@
-git-feature(1) -- Create feature branch
+git-feature(1) -- Create/Merge feature branch
 =======================================
 
 ## SYNOPSIS
 
-`git-feature` [finish] <name>
+`git-feature` [-a|--alias branch_prefix] [finish] <name>
 
 ## DESCRIPTION
 
-  Create the given feature branch
+  Create/Merge the given feature branch
 
 ## OPTIONS
 
+  <-a|--alias branch_prefix>
+
+  use `branch_prefix` instead of `feature`
+
   <finish>
 
   Merge and delete the feature branch.
@@ -23,11 +27,17 @@ git-feature(1) -- Create feature branch
 
     $ git feature dependencies
     ...
-    $ git commit -m "Some changes"
+    $ (feature/dependencies) git commit -m "Some changes"
     ...
-    $ git checkout master
+    $ (feature/dependencies) git checkout master
     $ git feature finish dependencies
 
+    $ git alias features "feature -a features"
+    $ git features dependencies
+    $ (features/dependencies) ...
+    $ (features/dependencies) git checkout master
+    $ git features finish dependencies
+
 ## AUTHOR
 
 Written by Jesús Espino &lt;<[email protected]>&gt;