Skip to content
Commits on Sep 25, 2012
  1. @jeromebaum

    Use git_do where appropriate

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

    Prevent error message on git flow init.
    committed Jul 10, 2012
  2. 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.
    Fred Condo committed Jul 9, 2012
Commits on Jul 9, 2012
  1. 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,
    committed Jul 9, 2012
  2. Merge pull request #201 from sjaeckel/feature/msysInstall

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

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

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

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

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

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

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

    Support reading the tag message from a file in release/hotfix finish
    committed Jul 9, 2012
  10. 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
    committed Jul 9, 2012
Commits on Jul 3, 2012
  1. @jasom
Commits on Jun 9, 2012
  1. @sinbad

    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 (#98) on Mac
    sinbad committed Jun 8, 2012
Commits on Jun 5, 2012
  1. @sinbad

    Fix init -d behaviour when master branch exists, and one or more othe…

    …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
    sinbad committed Jun 5, 2012
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. @vedang
  2. @vedang

    Updated from upstream

    vedang committed May 1, 2012
Commits on Apr 21, 2012
  1. @pcragone

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

    … which gets called if subargument is not help
    pcragone committed Apr 21, 2012
Commits on Apr 19, 2012
  1. @mykehsd

    Feature finish squash parameter

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

    Release finish squash parameter

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

    Fixes #206

    jschmidtatet committed Apr 9, 2012
Commits on Mar 14, 2012
  1. @sjaeckel
Commits on Mar 12, 2012
  1. @vedang

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

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

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

    committed Feb 13, 2012
  2. @bloveridge

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

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

    This is done in anticipation of their discontinuing service.
    committed Feb 13, 2012
Something went wrong with that request. Please try again.