Updated from upstream

Author: vedang

AUTHORS

@@ -18,5 +18,6 @@ Authors are (ordered by first commit date):
 - Olivier Mengué
 - Emre Berge Ergenekon
 - Eric Holmes
+- Vedang Manerikar
 
 Portions derived from other open source works are clearly marked.

Changes.mdown

@@ -3,16 +3,21 @@
 Release date: **not yet**
 
 * `git flow init` now detects situations where origin already has gitflow
-  branches set up, and behaves accordingly (thanks Emre Berge Ergenekon)
+  branches set up, and behaves accordingly (thanks Emre Berge Ergenekon).
 
 * `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
+* `git flow feature pull` now has a `-r` flag, to support `pull --rebase`
+  semantics (thanks Vedang Manerikar).
 
-* Better support for Windows users.
+* Various minor bug fixes related to internal argument passing.
 
-* Add package installers for the Debian and Windows platforms.
+* Improved some documentation.
+
+* Better support for Windows and BSD users.
+
+* Add package installer for the Windows platform.
 
 0.4.1:
 -----

Makefile

@@ -27,12 +27,7 @@
 # policies, either expressed or implied, of Vincent Driessen.
 #
 
-# Determine if we're inside a debian build .. 
-ifdef DEB_BUILD_ARCH
-   prefix=$(DESTDIR)/usr/
-else
-   prefix=/usr/local
-endif
+prefix=/usr/local
 
 # files that need mode 755
 EXEC_FILES=git-flow

README.mdown

@@ -1,5 +1,6 @@
-git-flow ![Project status](http://stillmaintained.com/nvie/gitflow.png)
+git-flow
 ========
+
 A collection of Git extensions to provide high-level repository operations
 for Vincent Driessen's [branching model](http://nvie.com/git-model "original
 blog post").
@@ -83,13 +84,15 @@ in a Github fork, of course.
 
 To initialize a new repo with the basic branch structure, use:
 
-		git flow init
+		git flow init [-d]
 
 This will then interactively prompt you with some questions on which branches
 you would like to use as development and production branches, and how you
 would like your prefixes be named. You may simply press Return on any of
 those questions to accept the (sane) default suggestions.
 
+The ``-d`` flag will accept all defaults.
+
 
 ### Creating feature/release/hotfix/support branches
 
@@ -101,6 +104,11 @@ those questions to accept the (sane) default suggestions.
 
   For feature branches, the `<base>` arg must be a commit on `develop`.
 
+* To push/pull a feature branch to the remote repository, use:
+
+  		git flow feature publish <name>
+		  git flow feature pull <remote> <name>
+
 * To list/start/finish release branches, use:
 
   		git flow release