Skip to content


Subversion checkout URL

You can clone with
Download ZIP
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,
  2. Merge pull request #211 from pcragone/develop

    Added 'init()' function to git-flow-{feature,release,hotfix,support}
Commits on Feb 3, 2011
  1. Don't just take the last argument, take the first.

    This patch was originally contributed as a workaround for the cases
    where there were flags that took the first argument position.  This fix
    was just plain wrong and this commit reverts it.
Commits on Oct 8, 2010
  1. Manually select the last argument.

    This implementation does not rely on Bash-specific functionality.
Commits on Oct 5, 2010
  1. Allow finishing release branches without creating a tag.

    This is useful for small projects.
  2. Tidy up a bit.

Commits on Aug 21, 2010
Commits on Jul 22, 2010
  1. Change the default behaviour of all scripts to NOT fetch.

    This already was the default behaviour of git-flow-feature, but now it
    is the default for the other scripts, too.
    RATIONALE: Due to limitations on some platforms (and some
    implementations of getopt), it's impossible to turn off the -f (fetch)
    option.  Therefore, it must now be set explicitly.
    Also, this makes git-flow work in stand-alone repositories (i.e. repos
    that do not have an origin remote at all).
Commits on Jul 9, 2010
Commits on Apr 4, 2010
Commits on Feb 24, 2010
Commits on Feb 22, 2010
  1. Better naming of common functions categorizing them into common,

    git specific and git-flow specific functions:
    gitflow_current_branch             -> git_current_branch
    gitflow_is_branch_merged_into      -> git_is_branch_merged_into
    gitflow_local_branch_exists        -> git_local_branch_exists
    gitflow_local_branches             -> git_local_branches
    gitflow_remote_branches            -> git_remote_branches
    gitflow_require_branch             -> require_branch
    gitflow_require_branch_absent      -> require_branch_absent
    gitflow_require_branches_equal     -> require_branches_equal
    gitflow_require_clean_working_tree -> require_clean_working_tree
    gitflow_require_git_repo           -> require_git_repo
    gitflow_require_git_repo           -> require_git_repo
    gitflow_require_initialized        -> require_gitflow_initialized
    gitflow_require_initialized        -> require_gitflow_initialized
    gitflow_require_local_branch       -> require_local_branch
    gitflow_require_remote_branch      -> require_remote_branch
    gitflow_require_tag_absent         -> require_tag_absent
    gitflow_tag_exists                 -> git_tag_exists
    gitflow_test_branches_equal        -> git_compare_branches
    gitflow_test_clean_working_tree    -> git_is_clean_working_tree
    resolve_nameprefix                 -> gitflow_resolve_nameprefix
Commits on Feb 20, 2010
  1. Added function gitflow_require_initialized(), to assert that the gitflow

    variables are all set (they need to be set explicitly once).
  2. Rewrite the way git-flow initialized its variables in git-flow and as…

    existence of a valid git repo. Instead, functions gitflow_load_settings()
    and gitflow_require_git_repo() have been added that can be called in each
    submodule that requires such.
    Specifically, git-flow init does NOT use this.
  3. Don't store remote and local branch names in shell variables, but query

    them live using git commands instead. This avoids git commands being
    issued by subcommands that do not necessarily require an existing Git repo
    to be initialized (i.e. git-flow init).
Commits on Feb 19, 2010
  1. Fix spacing issues.

Commits on Feb 16, 2010
Commits on Feb 15, 2010
  1. Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:

    Went back from making use of the specific Bourne shell construct 'typeset
    -i' for easy integer calculations (typeset -i foo=123; foo=foo+456;) to a
    more compatible way (local foo=123; foo=$((foo+456)); )
    The 'typeset -f' call has been replaced by a call to 'type', effectively
    not testing for existence of a declared *function*, but testing for
    existence of a declared *something*. You have to sacrifice sometimes in
    order to be more portable.
Commits on Feb 9, 2010
Commits on Feb 8, 2010
  1. Made the finishing of release/hotfix branches fail-safe. When a

    release/hotfix branch fails finishing, the user may just try so again.
  2. Add tag annotation and tag signing to both release and hotfix.

    Require branch and tag to be absent when start is run (for release/hotfix)
    Require branch to exist when trying to finish (for release/hotfix)
    Die the finish script when either the fetch, checkout or tagging fails.
Commits on Feb 7, 2010
Commits on Feb 6, 2010
  1. Tidy up:

    - Lower-cased all local variable names
    - Explicitly typeset all local variable names, to prevent issues with
      setting/overriding variables in the global namespace.
    - Explicitly typed integer types as integer (typeset -i) to enable simpler
      arithmetic calculations on them.
Commits on Feb 4, 2010
  1. Added an optional <base> argument to all start subactions.

    The only exception to the rule is git-flow-support, which has an
    explicitly required <base> argument (since we cannot deduce a sane default
    name for base).
    Furthermore, these <base> arguments are checked to refer to commits on:
    - develop (for feature, release)
    - master  (for hotfix, support)
    Removed any occurrences of optional <base> arguments in finish subactions.
    The finishing target branches are clearly defined by the model. The <base>
    argument will probably confuse users. If they want the power to merge
    those feature branches into *other* branches then develop, for example,
    they can still use the magical power of Git itself for that. Gitflow
    should not provide such support.
Commits on Jan 29, 2010
  1. Make the 'to fetch or not to fetch' flag explicit in the other comman…

    …ds, too.
    Only difference is that the default equals to:
    0	for git-flow-feature
    1	for git-flow-{release,hotfix,support}
Commits on Jan 28, 2010
  1. Merge branch 'feature/subcmd-structure' into develop

Something went wrong with that request. Please try again.