From 59e6aefa1088b21d239e3a4c8f25946bc466f11a Mon Sep 17 00:00:00 2001
From: Vincent Driessen <vincent@datafox.nl>
Date: Mon, 16 May 2011 11:04:42 +0200
Subject: [PATCH] Update usage docs and changelog.

---
 Changes.mdown    | 3 +++
 git-flow-feature | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changes.mdown b/Changes.mdown
index 80139a0b6..76fad8689 100644
--- a/Changes.mdown
+++ b/Changes.mdown
@@ -2,6 +2,9 @@
 -----
 Release date: **not yet**
 
+* `git flow feature finish` can now be called without a feature branch
+  name(prefix) argument and will finish the current branch, if on any.
+
 * Various minor bug fixes related to internal argument passing
 
 0.4.1:
diff --git a/git-flow-feature b/git-flow-feature
index 2133330d4..9da4b0bfa 100644
--- a/git-flow-feature
+++ b/git-flow-feature
@@ -44,7 +44,7 @@ PREFIX=$(git config --get gitflow.prefix.feature)
 usage() {
 	echo "usage: git flow feature [list] [-v]"
 	echo "       git flow feature start [-F] <name> [<base>]"
-	echo "       git flow feature finish [-rFk] <name|nameprefix>"
+	echo "       git flow feature finish [-rFk] [<name|nameprefix>]"
 	echo "       git flow feature publish <name>"
 	echo "       git flow feature track <name>"
 	echo "       git flow feature diff [<name|nameprefix>]"