Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 5, 2010
  1. Nowell Strite Vincent Driessen

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

    nowells authored nvie 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.
Commits on Aug 22, 2010
  1. Adam Gibbins

    Fixed incorrect color flag

    adamgibbins authored
Commits on Aug 21, 2010
  1. Vincent Driessen
Commits on Jul 22, 2010
  1. Vincent Driessen

    Change the default behaviour of all scripts to NOT fetch.

    nvie 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
  1. Vincent Driessen
Commits on Jun 29, 2010
  1. Randy Merrill Vincent Driessen

    Adding an extra line to the output for extra spacing.

    Zoramite authored nvie committed
  2. Randy Merrill Vincent Driessen

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

    Zoramite authored nvie committed
    …rresponding branches found.
Commits on Apr 4, 2010
  1. Vincent Driessen
Commits on Feb 24, 2010
  1. Vincent Driessen
Commits on Feb 22, 2010
  1. Vincent Driessen

    Better naming of common functions categorizing them into common,

    nvie 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. Vincent Driessen

    Added function gitflow_require_initialized(), to assert that the gitflow

    nvie authored
    variables are all set (they need to be set explicitly once).
  2. Vincent Driessen

    Rewrite the way git-flow initialized its variables in git-flow and as…

    nvie 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. Vincent Driessen

    Don't store remote and local branch names in shell variables, but query

    nvie 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 15, 2010
  1. Vincent Driessen

    Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:

    nvie authored
        https://wiki.ubuntu.com/DashAsBinSh
    
    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
  1. Vincent Driessen
  2. Vincent Driessen
  3. Vincent Driessen
  4. Vincent Driessen
Commits on Feb 7, 2010
  1. Vincent Driessen
Commits on Feb 6, 2010
  1. Vincent Driessen

    Tidy up:

    nvie authored
    - 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. Vincent Driessen

    Added an optional <base> argument to all start subactions.

    nvie authored
    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.
  2. Vincent Driessen
Commits on Jan 29, 2010
  1. Vincent Driessen

    Make the 'to fetch or not to fetch' flag explicit in the other comman…

    nvie authored
    …ds, too.
    
    Only difference is that the default equals to:
    0	for git-flow-feature
    1	for git-flow-{release,hotfix,support}
  2. Vincent Driessen
Commits on Jan 28, 2010
  1. Vincent Driessen

    Merge branch 'feature/subcmd-structure' into develop

    nvie authored
    Conflicts:
    	git-flow-feature
    	git-flow-hotfix
    	git-flow-release
    	git-flow-support
  2. Vincent Driessen

    Give all subcommands an optional setup() function that will be called…

    nvie authored
    … by git-flow in order to let the subcommand initialize its environment.
    
    Give all the branch-type subcommands a default explicit "list" action, too.
    
    Order the functions inside each of the subcommands in a specific order, for consistency:
    - usage()
    - setup()
    - cmd_default()
    - cmd_list()
    - cmd_help()
    - parse_args()
    - other commands
Commits on Jan 27, 2010
  1. Benedikt Böhm
  2. Vincent Driessen
  3. Benedikt Böhm Vincent Driessen

    make version tag prefix configurable so one can use it for github sem…

    hollow authored nvie committed
    …ver.org compliance
Commits on Jan 26, 2010
  1. Vincent Driessen

    Don't assume git aliases.

    nvie authored
  2. Vincent Driessen

    Omit 'v' prefix.

    nvie authored
  3. Vincent Driessen
  4. Benedikt Böhm

    make git fetch silent

    hollow authored
  5. Benedikt Böhm
  6. Benedikt Böhm

    make origin configurable

    hollow authored
Something went wrong with that request. Please try again.