Permalink
Commits on Sep 25, 2012
  1. Use git_do where appropriate

    jeromebaum committed Sep 25, 2012
Commits on Jul 10, 2012
  1. Merge pull request #235 from oddnoc/feature/112-init-fix

    nvie committed Jul 10, 2012
    Prevent error message on git flow init.
  2. Prevent error message on git flow init

    Fred Condo committed Jul 10, 2012
    As explained by Peter van der Does, the init command does not have the
    init function, nor does it need one.
Commits on Jul 9, 2012
  1. Be git-describe friendly.

    nvie committed Jul 9, 2012
    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,
  2. Merge pull request #201 from sjaeckel/feature/msysInstall

    nvie committed Jul 9, 2012
    make the installer for msysgit search in ~/bin as well
  3. Revert unnecessary changes.

    nvie committed Jul 9, 2012
  4. Credit where credit is due.

    nvie committed Jul 9, 2012
  5. Merge pull request #211 from pcragone/develop

    nvie committed Jul 9, 2012
    Added 'init()' function to git-flow-{feature,release,hotfix,support}
  6. Merge pull request #219 from kperi/develop

    nvie committed Jul 9, 2012
    small bug fix in gif-flow-feature
  7. Merge pull request #220 from memleak/patch-1

    nvie committed Jul 9, 2012
    fixes pull existing feature from remote.
  8. Merge pull request #227 from jasom/develop

    nvie committed Jul 9, 2012
    Fix broken link to original blog-post
  9. Merge pull request #223 from sinbad/feature/tagmessagefromfile

    nvie committed Jul 9, 2012
    Support reading the tag message from a file in release/hotfix finish
  10. Merge pull request #222 from sinbad/feature/fix_default_behaviour

    nvie committed Jul 9, 2012
    Fix init -d behaviour when master branch exists, and 1+ other branches exist, but develop does not
Commits on Jul 3, 2012
Commits on Jun 9, 2012
  1. Support reading the tag message from a file in release/hotfix finish

    sinbad committed Jun 9, 2012
    This option ('-f' because '-F' was already taken) maps to the 'tag -F' option, and avoids the
    problem with issue #98 (#98) on Mac
Commits on Jun 5, 2012
  1. Fix init -d behaviour when master branch exists, and one or more othe…

    sinbad committed Jun 5, 2012
    …r 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
Commits on Jun 1, 2012
  1. fixes pull existing feature from remote.

    memleak committed Jun 1, 2012
Commits on May 31, 2012
Commits on May 1, 2012
  1. Updated from upstream

    vedang committed May 1, 2012
Commits on Apr 21, 2012
  1. Added 'init()' function to git-flow-{feature,release,hotfix,support},…

    pcragone committed Apr 21, 2012
    … which gets called if subargument is not help
Commits on Apr 19, 2012
  1. Feature finish squash parameter

    mykehsd committed Apr 19, 2012
    Adding an optional (false by default) -S option to 'git flow feature finish' to allow squashing
    the commit
  2. Release finish squash parameter

    mykehsd committed Apr 19, 2012
    Adding an optional (false by default) -S option to 'git flow release finish' to allow squashing
    the commit
Commits on Apr 9, 2012
  1. Fixes #206

    Jason Schmidt committed Apr 9, 2012
Commits on Mar 14, 2012
Commits on Mar 12, 2012
  1. Added a track command to git-flow-hotfix along the lines of the git-f…

    vedang committed Mar 12, 2012
    …low-feature track command
Commits on Feb 14, 2012
  1. Merge branch 'debian-installer' into develop

    nvie committed Feb 14, 2012
    Conflicts:
    	README.mdown
Commits on Feb 13, 2012
  1. Update the Changelog.

    nvie committed Feb 13, 2012
  2. set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly

    bloveridge committed with nvie Jan 6, 2012
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
  3. Remove the "still maintained" banner.

    nvie committed Feb 13, 2012
    This is done in anticipation of their discontinuing service.