Merge branch 'release/0.4.1.0'
diff --git a/README.markdown b/README.markdown
index 8d0c5f9..80674ce 100644
--- a/README.markdown
+++ b/README.markdown
@@ -59,6 +59,6 @@
The Fine Print
--------------
-Copyright (c) 2010 [Justin Hileman](http://justinhileman.com)
+Copyright (c) 2011 [Justin Hileman](http://justinhileman.com)
Distributed under the [MIT License](http://creativecommons.org/licenses/MIT/)
diff --git a/git-flow-completion.bash b/git-flow-completion.bash
index 276c30d..e6c8cd3 100755
--- a/git-flow-completion.bash
+++ b/git-flow-completion.bash
@@ -41,7 +41,7 @@
# The Fine Print
# --------------
#
-# Copyright (c) 2010 [Justin Hileman](http://justinhileman.com)
+# Copyright (c) 2011 [Justin Hileman](http://justinhileman.com)
#
# Distributed under the [MIT License](http://creativecommons.org/licenses/MIT/)
@@ -181,14 +181,14 @@
__git_flow_list_branches ()
{
local prefix="$(__git_flow_prefix $1)"
- git branch 2> /dev/null | tr -d ' |*' | grep "^$prefix" | sed s,^$prefix,,
+ git branch 2> /dev/null | tr -d ' |*' | grep "^$prefix" | sed s,^$prefix,, | sort
}
__git_flow_list_remote_branches ()
{
local prefix="$(__git_flow_prefix $1)"
local origin="$(git config gitflow.origin 2> /dev/null || echo "origin")"
- git branch -r 2> /dev/null | sed "s/^ *//g" | grep "^$origin/$prefix" | sed s,^$origin/$prefix,,
+ git branch -r 2> /dev/null | sed "s/^ *//g" | grep "^$origin/$prefix" | sed s,^$origin/$prefix,, | sort
}
# alias __git_find_on_cmdline for backwards compatibility