Skip to content
Browse files

Merge branch 'release/0.4.1.0'

  • Loading branch information...
2 parents 5945702 + 821fa74 commit 429930f41cfe9956e87c7f7b74fe64adca6410ab @bobthecow bobthecow committed Apr 29, 2011
Showing with 4 additions and 4 deletions.
  1. +1 −1 README.markdown
  2. +3 −3 git-flow-completion.bash
View
2 README.markdown
@@ -59,6 +59,6 @@ To achieve git-flow completion nirvana:
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/)
View
6 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_prefix ()
__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

0 comments on commit 429930f

Please sign in to comment.
Something went wrong with that request. Please try again.