Closes nvie#109 and closes nvie#108

asnowfix · Sep 10, 2013 · 8e887e0 · 8e887e0
1 parent d5b3a65
commit 8e887e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Changes.mdown b/Changes.mdown
@@ -17,10 +17,11 @@
 [cyberbob]: https://github.com/cyberbob
 [shpoont]: https://github.com/shpoont
  [jsivak]: https://github.com/jsivak
+ [OpherV]: https://github.com/OpherV
 
 # Changelog
 
-#### 1.7.0-dev.29
+#### 1.7.0-dev.33
 [Peter van der Does][petervanderdoes]
 * Refactor the gitflow override flag functions.
 * Shortcut for finish, delete, and publish commands.  
@@ -38,6 +39,11 @@
 [John Sivak][jsivak] 
 * Fix sanity check for release track command.
 
+[Opher Vishnia][OpherV]
+* Fix feature pull.  
+  The pull request fails when there's no local branch with the same name as the
+  remote branch.
+
 #### 1.6.1
 [Peter van der Does][petervanderdoes]
 * Migration of gitflow_config fails for posix sh.

diff --git a/git-flow-version b/git-flow-version
@@ -35,7 +35,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-GITFLOW_VERSION=1.7.0-dev.29
+GITFLOW_VERSION=1.7.0-dev.33
 
 initialize() {
 	# A function can not be empty. Comments count as empty.