Merge branch 'hotfix/0.2.1'
Merge branch 'release/0.3'
Merge branch 'release/0.4'
Merge branch 'release/0.4.1'
Added a simple command to be able to merge develop directly into master.

For our use case, the release branch is an overkill, and all testing,
continuous integration and data qa can be run in the develop branch.

If / when we get a dedicated QA team who will QA and push to production
separately, then it makes sense to not have this.

Squashed commit of the following:

commit 2be136c0b1277d1a47784c200dc6d35e4cc771a7
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 14:50:27 2013 -0400

    added the shFlags

commit eb0173843bb35827f183bb1c6a423604c43f62fc
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 14:49:32 2013 -0400

    Added git-flow-develop

commit 15aab26490facf285acef56cb5d61025eacb3a69
Author: Jerome Baum <jerome@jeromebaum.com>
Date:   Tue Sep 25 15:46:52 2012 +0200

    Use git_do where appropriate

commit 5bca8d9358f5b08af40ac32f289bb14b18965cec
Author: Jerome Baum <jerome@jeromebaum.com>
Date:   Tue Sep 25 15:46:44 2012 +0200

    Create a git_do command to log git actions

commit 53e9c7680a2892ceeb5a21c11367940eca8407a0
Merge: aa93d23 b72a395
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Tue Jul 10 02:18:02 2012 -0700

    Merge pull request #235 from oddnoc/feature/112-init-fix

    Prevent error message on git flow init.

commit b72a395ba6d0659f1008754000bb6a066a7fb551
Author: Fred Condo <fcondo@quinn.com>
Date:   Mon Jul 9 18:37:12 2012 -0700

    Prevent error message on git flow init

    As explained by Peter van der Does, the init command does not have the
    init function, nor does it need one.

commit aa93d2346f840e16a05c6546e1e22c1dddfbc997
Merge: afb191f aec4818
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 15:02:33 2012 +0200

    Be git-describe friendly.

    This patch tags commits on the original (release/hotfix branch) instead
    of tagging the merge commit on the master branch.  This keeps the
    history git-describe friendly.  (For related discussions, see #49, #85,

commit aec48189a7a53fd8d14faab26db57a9f0672363e
Merge: a2f53f9 51011ac
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 05:52:48 2012 -0700

    Merge pull request #201 from sjaeckel/feature/msysInstall

    make the installer for msysgit search in ~/bin as well

commit a2f53f9499d8bd6881d0fea38bbe231da6b18559
Merge: 76ec133 805d245
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 14:38:05 2012 +0200

    Merge branch 'develop' into track-for-hotfix

commit 76ec133f9d2a643a930c05b126e5673f4c2c5f75
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 14:38:01 2012 +0200

    Revert changes installer location.

commit c7e50eed6ed23002778bcaaccd70c4e91a7d5cea
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 14:37:29 2012 +0200

    Revert unnecessary changes.

commit 805d2454ee0fd68e1bf0778b38d05789998daadf
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 14:31:17 2012 +0200

    Credit where credit is due.

commit fda5507f7bceff5906d1a1109f3a5e8143d49691
Merge: 0c4d0bf f414f0c
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 14:24:06 2012 +0200

    Merge branch 'develop' into squash-option

commit 0c4d0bf0f01b252967fb8f79d946642901d80b92
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 14:23:59 2012 +0200

    Cleanup (mostly whitespace issues).

commit f414f0cab6573e1ac54d489af20327c1c91094e7
Merge: c072ff6 dc902ed
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 05:16:25 2012 -0700

    Merge pull request #211 from pcragone/develop

    Added 'init()' function to git-flow-{feature,release,hotfix,support}

commit c072ff61dc9dcb10569b6e26e69574f66084a9e6
Merge: b1cc495 a223c3a
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 05:06:22 2012 -0700

    Merge pull request #219 from kperi/develop

    small bug fix in gif-flow-feature

commit b1cc495ab8b6fae2fcc4614484604423434bc541
Merge: 392ed79 12c2a9c
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 05:04:41 2012 -0700

    Merge pull request #220 from memleak/patch-1

    fixes pull existing feature from remote.

commit 392ed795e4b3c0472d0e60eb028298265cfa0c7c
Merge: 662bcd6 9c48e05
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 05:00:22 2012 -0700

    Merge pull request #227 from jasom/develop

    Fix broken link to original blog-post

commit 662bcd6ce8a62e4b3268a6bd41aa2c8cd9bf1706
Merge: c26286e 2e9ab49
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 04:58:40 2012 -0700

    Merge pull request #223 from sinbad/feature/tagmessagefromfile

    Support reading the tag message from a file in release/hotfix finish

commit c26286e365f4ffd9ce1e7bddcf457226e88e4875
Merge: ab7fda2 2632778
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Jul 9 04:58:20 2012 -0700

    Merge pull request #222 from sinbad/feature/fix_default_behaviour

    Fix init -d behaviour when master branch exists, and 1+ other branches exist, but develop does not

commit 9c48e0569a4e6ce0c028ce580c6c0a592f916b07
Author: Jason Miller <jason@milr.com>
Date:   Tue Jul 3 13:25:52 2012 -0700

    Fix broken link to original blog-post

commit 2e9ab49e7548e3593007ddaac4dd45c1c746b202
Author: Steve Streeting <steve@stevestreeting.com>
Date:   Fri Jun 8 17:38:34 2012 -0700

    Support reading the tag message from a file in release/hotfix finish

    This option ('-f' because '-F' was already taken) maps to the 'tag -F' option, and avoids the
    problem with issue #98 (https://github.com/nvie/gitflow/issues/98) on Mac

commit 26327787c75249ca684af39bc111a5f4847ae01e
Author: Steve Streeting <steve@stevestreeting.com>
Date:   Tue Jun 5 16:26:10 2012 -0700

    Fix init -d behaviour when master branch exists, and one or more other branch exists, but develop does not
    Without this change, init picks 'master' as both the production and integration branch and fails. With it, init detects the clash and behaves the same as if only master exists, picking 'develop' as integration branch

commit 12c2a9c307058cc38f965bd4a412af7c16192090
Author: memleak <alice@wiewunderland.de>
Date:   Fri Jun 1 13:45:31 2012 +0300

    fixes pull existing feature from remote.

commit a223c3a63326f4803f7679748933c0740fcf2dc8
Author: Kostas <kostas.perifanos@pearson.com>
Date:   Thu May 31 12:28:37 2012 +0100

    fixed small bug in line 510, 'it' instead of 'git'

commit ad511b68a36f24d8fe8ba40d1675ed9ce0ebcb60
Merge: 37f7d14 6606678
Author: Vedang Manerikar <ved.manerikar@gmail.com>
Date:   Tue May 1 16:19:15 2012 +0530

    Merge branch 'develop' into feature/hotfix-tracking

commit 6606678a2cfa7f668c5466c42cebf8e460d68d60
Merge: 3b86dd3 ab7fda2
Author: Vedang Manerikar <ved.manerikar@gmail.com>
Date:   Tue May 1 16:18:44 2012 +0530

    Updated from upstream

commit dc902eda3e79ae00a293b9dd2006c019ab252520
Author: pccr <pcragone@gmail.com>
Date:   Sat Apr 21 00:23:55 2012 -0400

    Added 'init()' function to git-flow-{feature,release,hotfix,support}, which gets called if subargument is not help

commit 75fbdd7bf7b81eb8965f5ec4e78fc8776373aa75
Author: Myke Hines <myke@webhines.com>
Date:   Thu Apr 19 11:14:22 2012 -0700

    Feature finish squash parameter
    Adding an optional (false by default) -S option to 'git flow feature finish' to allow squashing
    the commit

commit 6fa8fed23e2781767b8d3e8ab7e2b3f30876c7c7
Author: Myke Hines <myke@webhines.com>
Date:   Thu Apr 19 11:01:23 2012 -0700

    Release finish squash parameter
    Adding an optional (false by default) -S option to 'git flow release finish' to allow squashing
    the commit

commit afb191f790b113c1ebf0a5c4ab06676632a8b5db
Author: Jason Schmidt <JSchmidt@ExactTarget.com>
Date:   Mon Apr 9 11:19:20 2012 -0400

    Fixes #206

commit 51011ac8fdfb1b66c34ea74186bf24412ca70eb2
Author: Steffen Jaeckel <steffen.jaeckel@stzedn.de>
Date:   Wed Mar 14 11:59:55 2012 +0200

    make the installer for msysgit search in ~/bin as well

commit 37f7d14b2f566390c824be6168ec730d11bb531e
Author: Vedang Manerikar <ved.manerikar@gmail.com>
Date:   Mon Mar 12 17:03:11 2012 +0530

    Added a track command to git-flow-hotfix along the lines of the git-flow-feature track command

commit ab7fda21f1009d8cc073fc9ae6152731f6bfee8a
Merge: cc5e9a5 1b454cc
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Tue Feb 14 14:10:31 2012 +0100

    Merge branch 'debian-installer' into develop

    Conflicts:
    	README.mdown

commit cc5e9a58bc84100df9b9e2f217ef8bb688ccd996
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Feb 13 21:20:22 2012 +0100

    Update the Changelog.

commit f60828188567304a920197bae17d3246c8359ed2
Author: Ben Loveridge <bloveridge@movenetworks.com>
Date:   Fri Jan 6 11:04:46 2012 -0700

    set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly

    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>

commit 679f05f4fb52f870b2186eb6f74f7246868f4613
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Feb 13 20:53:21 2012 +0100

    Remove the "still maintained" banner.

    This is done in anticipation of their discontinuing service.

commit 53cfc35147096c5d5a43f8570b59a4b5b0aa7cf5
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Feb 13 20:48:14 2012 +0100

    Add Vedang to AUTHORS.

commit 7384052ee61b4aa25bad65e20615b9a7502e5998
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Feb 13 20:43:12 2012 +0100

    Fix indenting.

commit 56bff9a830faca63a9d916a43034562b3b34f734
Author: Vedang Manerikar <ved.manerikar@gmail.com>
Date:   Mon Jan 30 18:38:46 2012 +0530

    Added a -r flag to git-flow-feature-pull to support pull with rebase

    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>

commit adfd408c6db7d489bac11c8260cea59cbb668f90
Merge: bb1becd f66eba8
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Feb 13 11:33:54 2012 -0800

    Merge pull request #160 from Zoramite/feature/Issue50

    Adding the `eval` to force variable expansion.

commit bb1becd6614540905d17a7aaa9a8cc25a8c6e27d
Merge: ee27210 905cfb1
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Feb 13 11:23:46 2012 -0800

    Merge pull request #178 from lorin/feature/docs

    Documented init -d flag and feature publish/pull

commit ee272106a05505d62a0f84d8c9e3ec14ab860c4f
Merge: 07dacd5 afbf92c
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Sun Feb 12 23:47:02 2012 -0800

    Merge pull request #195 from Zoramite/feature/Issue148

    Updating the escape characters to fix + in the branch name

commit f66eba89d03e12ab5810a42a03c5161f31eb7280
Merge: d0df88d 07dacd5
Author: Randy Merrill <Zoramite@gmail.com>
Date:   Wed Feb 8 09:44:48 2012 -0800

    Merge branch 'develop' into feature/Issue50

commit afbf92c6208184f78b4209cd75679d6e25db70c9
Author: Randy Merrill <Zoramite@gmail.com>
Date:   Wed Feb 8 09:33:04 2012 -0800

    Updating the escape characters to fix an issue with having a + in the branch name.

    Since git allows for it the escape should not escape it since it then won't match the branch names correctly.

commit 3b86dd34ca400d039ef1d7a1b07f30ad3ad6cb83
Author: Vedang Manerikar <ved.manerikar@gmail.com>
Date:   Mon Jan 30 19:26:38 2012 +0530

    install from my github repo

commit 6158d5163fc032632d942dd7520090e5d82e498d
Author: Vedang Manerikar <ved.manerikar@gmail.com>
Date:   Mon Jan 30 18:38:46 2012 +0530

    Added a -r flag to git-flow-feature-pull to support pull with rebase

commit 905cfb1e38e39e12eb9070f94914bcb8d9506e00
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Tue Dec 20 10:21:46 2011 -0500

    whitespace

commit 5a586336158de625ed9bc9541465b5643f9805d5
Author: Lorin Hochstein <lorin@isi.edu>
Date:   Tue Dec 20 10:17:54 2011 -0500

    Documented init -d flag and publish/pull

    Documented the -d flag for init command

    Added docs for feature push and feature pull

commit 07dacd5212c98c2e12f583a2acfb365eeb784f8b
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Tue Dec 6 22:12:54 2011 +0100

    Moved all installation instructions to the Wiki.

    There were becoming so large they were muddling the README.

commit e8c88c0561c1db112776a3457c539e08cd15d60d
Merge: 6107f88 c02c12d
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue Dec 6 12:54:17 2011 -0800

    Merge pull request #173 from AlexZeitler/patch-1

    Updated Cygwin section with possibly missing package.

commit c02c12dd760be6b405bcbcb45e0f71450d9a7d9e
Author: Alexander Zeitler <alex@alexonasp.net>
Date:   Tue Dec 6 21:38:04 2011 +0100

    Updated Cygwin section with possibly missing package.

commit 6107f88833612d311ae0e249750483e5b6f31458
Merge: 72594ea e856e0a
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue Dec 6 02:36:03 2011 -0800

    Merge pull request #172 from sjaeckel/develop

    fixed the installer in msysgit environment to work with windows XP

commit e856e0a528daaf212f1b74696f6ef730beed856f
Author: Steffen Jaeckel <steffen.jaeckel@stzedn.de>
Date:   Tue Dec 6 08:46:01 2011 +0100

    fixed the installer in msysgit environment to work with windows XP

    as the command 'choice' is not available on Windows XP we have to work around
    this issue by usage of 'set /p'

commit 72594ea4db64fe61d7283227b79162706e00096f
Merge: b4626cb 083a588
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Thu Dec 1 15:40:04 2011 +0100

    Merge branch 'feature/convert-slashes' into develop

commit 083a588d4fba8ea4a5a0f6b529cb47c9f0be47e0
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Thu Dec 1 08:56:59 2011 +0100

    Better support for the Windows platform, where backslashes are dominant.

commit 5e8cc9fceb509848dee2cd62e98aadc29ffa146b
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Thu Dec 1 08:52:33 2011 +0100

    Oops, forgot about spaces in the dirname.

    Quite likely for Windows users to hit this problem.

commit 4b9545e5822d3dee65a673e81b80328df7bb151e
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Wed Nov 30 22:52:20 2011 +0100

    Add a proposal for our Windows users.

    Will this help you guys out?

commit b4626cb1b5392d22843b0d32dd73d09627526c15
Merge: 49305ec 921ddf5
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Wed Nov 30 22:16:21 2011 +0100

    Merge branch 'develop' of github.com:nvie/gitflow into develop

commit 49305ec93d8c1bdf897df8a8e9ccee92f0d3d23d
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Wed Nov 30 22:14:40 2011 +0100

    Rewrote Eric's text a bit.

commit 921ddf56e293584309753d2246d045bb1c91671c
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Tue Nov 29 11:31:18 2011 +0100

    Add Eric Holmes to list of contributors.

commit ba0cc8a70f5ab58089b751d1140809f2e28099e9
Author: Eric Holmes <eric@ejholmes.net>
Date:   Tue Nov 29 00:23:15 2011 -0800

    Add --recursive.

commit 938ea5f07485118efbf5da60239af73f4f9308a7
Author: Eric Holmes <eric@ejholmes.net>
Date:   Tue Nov 29 00:14:30 2011 -0800

    Add information for contributing.

commit baf163e07d579bec3dd0e21d00297832e8848b8b
Author: Eric J. Holmes <eric@ejholmes.net>
Date:   Mon Nov 28 23:28:47 2011 -0800

    Check if a remote master branch exists before die, track it if no local master branch exists

commit 0d00b698f2567737137fcac464d146a78ee7af0c
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Mon Nov 28 09:43:57 2011 +0100

    Add Changelog note and added Emre to list of contributors.

commit 62c339eba9441dc519f83daa2ce96c243ae89730
Author: Emre Berge Ergenekon <emre.b.ergenekon@gmail.com>
Date:   Sun Nov 27 22:07:57 2011 -0800

    develop_branch uses origin/develop_branch as start-point if one exists.

    By default a local develop branch is created of from master regardless if a origin/develop exits. This problem is discussed in issues #137 and #23.

commit 766159d3039bd4f693c15bbb57c7d748e88b6c2c
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Thu Nov 24 13:02:00 2011 +0100

    Add a cool new video tutorial on git-flow by Build a Module.

commit 7cbdb84c0170cbd5e72481bd3a27e0e3528b5d63
Merge: 447808f 0b324de
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Wed Nov 23 11:41:24 2011 -0800

    Merge pull request #163 from phoet/publish_hotfix

    add publishing to hotfix

    Thanks, pulled.

commit 447808fa70c3a219a2a88bd51be387cb80bb001e
Merge: be5dabf 4895c15
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Wed Nov 23 20:37:32 2011 +0100

    Merge branch 'chad3814-develop' into develop

    Thanks, chad3814.

commit 4895c15e440b85ab8b53c4ff9cd4e715211f778d
Author: Vincent Driessen <vincent@3rdcloud.com>
Date:   Wed Nov 23 20:36:16 2011 +0100

    Fix wording.

commit 0b324def488f2e73e0db6109e440974f3aab265f
Author: Peter Schröder <phoetmail@googlemail.com>
Date:   Sat Nov 12 17:36:36 2011 +0100

    add publishing to hotfix

commit 9c5c806cf97cc44db39d4536358ad1288294023c
Author: Chad Walker <chad@chad-cat-lore-eddie.com>
Date:   Tue Oct 25 15:42:32 2011 -0700

    added a -D flag to the git flow finish command to try extra hard to delete the local branch after finishing the feature

commit d0df88da6968c39e5c0422a5634060f559081d26
Author: Randy Merrill <Zoramite@gmail.com>
Date:   Thu Oct 13 21:09:26 2011 -0700

    Adding the variable expansion to the hotfix.

commit 05c4dbc8a8a8a1a78de12ee0b6ea1d3710fb05bf
Author: Randy Merrill <Zoramite@gmail.com>
Date:   Thu Oct 13 20:28:10 2011 -0700

    Adding the `eval` to force variable expansion.

    Closes #50

commit 1b454cc0cfca72e8d67882fa46f56d8d6d611603
Author: Gergely Nagy <algernon@madhouse-project.org>
Date:   Thu Aug 25 09:24:55 2011 +0200

    Replace contrib/debian/ with a note on how to install on Debian.

    Since gitflow is packaged for Debian and is available for testing and
    sid already, remove the contrib/ directory in favour of using the
    official Debian package.

    Also mention how to install gitflow on Debian in the README.mdown.

    Furthermore, Debian-specific things were removed from Changes.mdown
    and the Makefile.

    Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

commit be5dabf88e98075b9bc936bfa7de0f54a21a0482
Merge: 7c7dc35 0c32062
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Wed Jul 27 00:56:17 2011 -0700

    Merge pull request #141 from moranjk/develop

    fixed malformed if statement

    Thanks, James.

commit 0c3206201ad720a11131188399a22c93b0a44974
Author: James Moran <jmoran@jmoran-work.(none)>
Date:   Tue Jul 26 10:39:35 2011 -0400

    fixed malformed if statement

commit 7c7dc35c05247d5c5cf51b5bc1e1f0130cdb4a71
Merge: 3d12772 06e854a
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon Jul 11 17:06:26 2011 +0200

    Merge branch 'develop' of https://github.com/kixx/gitflow into develop

commit 3d127721a0c4afecfca2615bb94fee7ab9e21d22
Merge: 0191c68 e73a1d9
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon Jul 11 07:59:04 2011 -0700

    Merge pull request #138 from MarkBorcherding/feature/windows-install-step

    Adding windows install intruction for libintl3.dll

commit e73a1d95d176b695ca39cb02bd4873248a3ce8fb
Author: Mark Borcherding <markborcherding@gmail.com>
Date:   Fri Jul 8 11:29:10 2011 -0500

    Adding windows install step for libintl3.dll

    I found I also needed to install this file. It was mentioned in
    issue #109. Adding this step to the instruction might help others
    avoid this same problem.

commit 06e854ab1257c87f52632d367cc85345cddb863f
Author: Gruen Christian-Rolf (Kiki) <kiki@bsdro.org>
Date:   Wed Jul 6 18:07:01 2011 +0300

    Fix parsing for Bourne shell (FreeBSD)

commit 0191c68d136f64f05776051d8c0fea3ef5c146f7
Merge: 14bcc58 26293bb
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon Jun 13 22:21:57 2011 -0700

    Merge pull request #132 from kwasticat/develop

    Install script depends on Bash-only features, needs slight adjustment!

commit 26293bb3a90f4173b460eb396335987872637c9f
Author: Tacit Sawk <tacit@kwasticat.com>
Date:   Tue Jun 14 10:51:43 2011 +1000

    This script depends on Bash-only features, and so should not be executed with sh.

commit 14bcc58e6843260393afff7214f2cd26cd0418e6
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon May 23 13:02:21 2011 +0200

    Update the version number to distinguish HEAD from the released 0.4.1 version.

commit 8b73fed62f749d5d817132c43d5d2a9a4103b753
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon May 16 11:09:18 2011 +0200

    Update the changelog.

commit 59e6aefa1088b21d239e3a4c8f25946bc466f11a
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon May 16 11:04:42 2011 +0200

    Update usage docs and changelog.

commit cf5b2a5562767ac80ce1e9e103c5e460dd0dabce
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon May 16 10:37:16 2011 +0200

    Implement git flow feature finish without a branch name to finish the
    current branch, if any.

    This fixes #127.

commit c4b4b3c286c834d6c306b7fe54dc365b27635bb4
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon May 16 10:44:13 2011 +0200

    Make room for new minor release (and update the changelog).

commit b7fc8868f92c64773ed71696fd30bb03ead43fbb
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue May 10 13:36:12 2011 +0200

    Add Olivier Mengué to the list of contributors.

    Thanks for the MSysGit installer!

commit 9720b66c598ccfea856c4a6faf3d8dc8007bc6fa
Merge: 3626bfb b52f79e
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue May 10 04:34:54 2011 -0700

    Merge pull request #109 from dolmen/feature/msysgit-install

    Installer for the Windows msysgit environment

commit 3626bfb2edf028ce8384d98063784b9837df309b
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Wed Apr 27 10:21:56 2011 +0200

    Revert "Set GITFLOW_DIR correctly if git-flow is a symbolic link"

    This reverts commit fff16edd881fee12547114d37e64d86582a9e392.

commit f9ace1f6f504c2e96609b16e498e1ba55fd0fac9
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue Apr 26 14:59:09 2011 +0200

    Add Jon Bernard to the list of contributors.

commit a64939d77bacb78964f153365ecdbbcf8dfba8c4
Merge: d762995 fff16ed
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue Apr 26 05:57:34 2011 -0700

    Merged pull request #119 from jbernard/develop.

    Set GITFLOW_DIR correctly if git-flow is a symbolic link

commit d7629954765d813be4ec02920adceaec0ea4fe7a
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue Apr 26 14:14:30 2011 +0200

    Add Kiall Mac Innes to the list of contributors.

    Thanks Kiall for the Debian package files!

commit 7e583b50a393b988f9dc55bc5a6562fd51e9fbb8
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue Apr 26 14:13:45 2011 +0200

    Moved the debian stuff to the contrib directory.

commit 96e3e3f79b55ba5702063ece132381e59dfe1714
Merge: a7a89cd 6fc1323
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Tue Apr 26 05:12:46 2011 -0700

    Merged pull request #120 from kiall/develop.

    Add debian/ubuntu packaging

commit 6fc1323fff4e477ca68de14dc589fd1385681681
Author: Kiall Mac Innes <kiall@managedit.ie>
Date:   Tue Apr 26 00:32:22 2011 +0100

    Fixing some minor mistakes in debian/control metadata - followup to ca475abb09fc761e06720b15d05f33710a17409c

commit ca475abb09fc761e06720b15d05f33710a17409c
Author: Kiall Mac Innes <kiall@managedit.ie>
Date:   Tue Apr 26 00:15:01 2011 +0100

    Add debian/ubuntu packaging.

commit fff16edd881fee12547114d37e64d86582a9e392
Author: Jon Bernard <jbernard@tuxion.com>
Date:   Sat Apr 23 13:09:57 2011 -0400

    Set GITFLOW_DIR correctly if git-flow is a symbolic link

    This allows a user to create a symbolic link to git-flow in their
    personal bin directory (e.g. ~/bin) without having to add the source
    tree to their $PATH or do a system install.

commit a7a89cdb13e0022c67fe2cd688708826828a60d6
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Sun Apr 17 08:41:36 2011 +0200

    Fix always-empty value for $DOT_GIT_DIR variable.

    This fixes #53.

commit e024fa451d38d0c78d599adafe332252e8a1c9c3
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Sun Apr 17 08:33:36 2011 +0200

    Add Jannis Leidel to the list of contributors.

commit 499b46820966e11a03bc3fb6c2401c1dd69a7f7d
Merge: 2f05c3c 8f280e0
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Sun Apr 17 08:32:37 2011 +0200

    Merge branch 'develop' of https://github.com/jezdez/gitflow into develop

commit 2f05c3c8bd68b6101575dcadeeead0a6a532a4db
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Sun Apr 17 08:13:10 2011 +0200

    Add Konstantin Tjuterev to the list of contributors.

commit f1b3213e4bf61fb589577fd23d7de9bdfc155282
Merge: 2074360 f6fcc4e
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Sun Apr 17 08:12:51 2011 +0200

    Merge branch 'develop' of https://github.com/kostiklv/gitflow into develop

commit 207436088c807b8d18ac5664e4f848aac1f539b2
Author: Stefan Näwe <stefan.naewe+github@googlemail.com>
Date:   Fri Apr 15 01:42:35 2011 -0700

    release: start subcommand takes an optional base as well

    Signed-off-by: Stefan Naewe <stefan.naewe@googlemail.com>

commit f6fcc4eed9c720ba9f0fab89e5f677be36efa7e2
Author: Konstantin Tjuterev <konstantin@intechsystems.lv>
Date:   Thu Apr 14 19:20:19 2011 +0300

    - Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the check was always false
    - Added fetching develop branch from origin when fetch flag is on in feature finish

commit 8f280e0b55911d84bd2a8550aef3b9e02d53787d
Author: Jannis Leidel <jannis@leidel.info>
Date:   Mon Mar 28 18:48:39 2011 +0200

    Fixed require_tag_absent to not break when the list of tags contains an ambiguous entry, e.g. looking for "1.0.1" in "0.1.0 0.1.1 0.1.2 1.0".

commit b52f79e3c1352ac11c50421222af4a20b2a695f3
Author: Olivier Mengué <dolmen@cpan.org>
Date:   Sun Mar 20 20:34:39 2011 +0100

    Update README for msysgit to use the new installer

commit 023ed6983e7bc14664c9095d1e099dd974ba25b8
Author: Olivier Mengué <dolmen@cpan.org>
Date:   Sun Mar 20 20:22:51 2011 +0100

    Add an installer for the msysgit environment

    This installer:
    - detects the Git installation path
    - checks prereqs (git, getopt.exe)
    - delete old gitflow install
    - install gitflow files

    "Access denied" errors are detected and the user is given advice in that case (
    use full administrator rights).

commit baf66bef47fe4c8a6019e77b16264c2b3a6e2f7a
Merge: f78b660 4b5b932
Author: Vincent Driessen <vincent@datafox.nl>
Date:   Mon Feb 14 07:47:48 2011 +0100

    Merge branch 'release/0.4.1' into develop
Merge branch 'develop'
Squashed commit of the following:

commit 1fe5991895df93f1d6aa6d8f1df0a8eb46642eb7
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 14:57:32 2013 -0400

    No need to merge twice.
Permission changes and develop checks before merging to master

Squashed commit of the following:

commit 1b0ed3ba54449f86ee210637d2fb4584d9f80081
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 15:10:02 2013 -0400

    Removed the check for the develop branch.

    Figured having the is_develop_configure check is enough.

commit 1863e75deec1c1ce83f852058202e61d62ceb7f5
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 15:08:27 2013 -0400

    Added executable permissions to git-flow-develop

commit 6921f746d101a4ac8f6bc96cb6a3e01e28211748
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 15:08:00 2013 -0400

    Added some additional checks to develop.

    To ensure that the develop branch exists and is configured.

commit 1fe5991895df93f1d6aa6d8f1df0a8eb46642eb7
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 14:57:32 2013 -0400

    No need to merge twice.
Conflicts:
	Makefile
	git-flow-develop
fixed conflicts
Merge branch 'master' into develop

Conflicts:
	git-flow-develop