Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 25, 2012
  1. @jeromebaum
Commits on Jul 9, 2012
  1. Be git-describe friendly.

    authored
    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

    authored
    Added 'init()' function to git-flow-{feature,release,hotfix,support}
Commits on Jun 9, 2012
  1. @sinbad

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

    sinbad authored
    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 Apr 21, 2012
  1. @pcragone

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

    pcragone authored
    … which gets called if subargument is not help
Commits on Apr 9, 2012
  1. @jschmidtatet

    Fixes #206

    jschmidtatet authored
Commits on Mar 12, 2012
  1. @vedang

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

    vedang authored
    …low-feature track command
Commits on Feb 8, 2012
  1. @Zoramite
Commits on Nov 12, 2011
  1. @phoet

    add publishing to hotfix

    phoet authored
Commits on Oct 14, 2011
  1. @Zoramite
Commits on Apr 14, 2011
  1. - Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the …

    Konstantin Tjuterev authored
    …check was always false
    
    - Added fetching develop branch from origin when fetch flag is on in feature finish
Commits on Feb 3, 2011
  1. Don't just take the last argument, take the first.

    authored
    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 Dec 2, 2010
  1. @sos4nt

    fixed typo

    sos4nt authored committed
Commits on Oct 8, 2010
  1. Manually select the last argument.

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

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

    authored
  3. @nowells

    Changed versiontag prefix to allow addition of dynamic data (i.e. date)

    nowells authored committed
    For example, you could set the versiontag prefix to be:
    
        git config --global gitflow.prefix.versiontag "production/\$(date +%Y/%m/%d/)"
    
    which would result in tag names like:
    
        production/2010/09/22/my-hotfix-or-feature-name
    
    NOTE:
    Although this is a useful addition in the current version of git-flow,
    in a future reimplementation of it in Python, this will be replaced by
    hook scripts, so be sure not to rely on this feature too much for now.
  4. @gjherbiet

    Added -k option to keep (feature|hotfix|relase) branch when calling '…

    gjherbiet authored committed
    …finish'.
Commits on Aug 22, 2010
  1. @adamgibbins

    Fixed incorrect color flag

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

    authored
    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 Jun 29, 2010
  1. @Zoramite

    Adding an extra line to the output for extra spacing.

    Zoramite authored committed
  2. @Zoramite

    Adding extra instructions when running the list option without any co…

    Zoramite authored committed
    …rresponding branches found.
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,

    authored
    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

    authored
    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…

    authored
    …sumed
    
    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

    authored
    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.

    authored
  2. @zerotao
Commits on Feb 16, 2010
Something went wrong with that request. Please try again.