Skip to content
This repository

Jan 02, 2012

  1. Vincent Driessen

    Revert all whitespace changes.

    authored January 02, 2012
  2. Peter van der Does

    Remove trailing whitespace

    Signed-off-by: Peter van der Does <peter@avirtualhome.com>
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    authored December 23, 2011 nvie committed January 02, 2012

Oct 05, 2010

  1. Nowell Strite

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

    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.
    authored September 22, 2010 nvie committed October 05, 2010

Aug 22, 2010

  1. Adam Gibbins

    Fixed incorrect color flag

    authored August 22, 2010

Aug 21, 2010

  1. Vincent Driessen

    Bugfix to avoid errors due to Git subcommands returning ANSI color ou…

    …tput.
    authored August 21, 2010

Jul 22, 2010

  1. Vincent Driessen

    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).
    authored July 22, 2010

Jul 09, 2010

  1. Vincent Driessen

    Change the URL of the original blog post.

    authored July 09, 2010

Jun 29, 2010

  1. Randy Merrill

    Adding an extra line to the output for extra spacing.

    authored June 26, 2010 nvie committed June 30, 2010
  2. Randy Merrill

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

    …rresponding branches found.
    authored June 26, 2010 nvie committed June 30, 2010

Apr 04, 2010

  1. Vincent Driessen

    Added inline license terms to all source files.

    authored April 04, 2010

Feb 24, 2010

  1. Vincent Driessen

    Document all available flags in all of the subcommand synopsis texts.

    authored February 24, 2010

Feb 22, 2010

  1. Vincent Driessen

    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
    authored February 21, 2010

Feb 20, 2010

  1. Vincent Driessen

    Added function gitflow_require_initialized(), to assert that the gitflow

    variables are all set (they need to be set explicitly once).
    authored February 20, 2010
  2. Vincent Driessen

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

    …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.
    authored February 16, 2010
  3. Vincent Driessen

    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).
    authored February 16, 2010

Feb 15, 2010

  1. Vincent Driessen

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

        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.
    authored February 15, 2010

Feb 09, 2010

  1. Vincent Driessen

    Better (less complex) way of counting the branch name length.

    authored February 10, 2010
  2. Vincent Driessen

    Use space (' ') instead of '?' as a pattern terminator.

    authored February 10, 2010
  3. Vincent Driessen

    Quote all variables in function/program arguments.

    authored February 10, 2010
  4. Vincent Driessen

    Do not quote variable assignments.

    authored February 10, 2010

Feb 07, 2010

  1. Vincent Driessen

    Replaced all old-style flag variables by shFlags-style flag variables.

    authored February 07, 2010

Feb 06, 2010

  1. Vincent Driessen

    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.
    authored February 06, 2010

Feb 04, 2010

  1. Vincent Driessen

    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.
    authored February 04, 2010
  2. Vincent Driessen

    Added -v (--verbose) flags to list subaction of all subcommands.

    authored February 04, 2010

Jan 29, 2010

  1. Vincent Driessen

    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}
    authored January 29, 2010
  2. Vincent Driessen

    Replace gitflow_check_ prefixes by gitflow_require_ prefixes, for con…

    …sistency.
    authored January 29, 2010

Jan 28, 2010

  1. Vincent Driessen

    Merge branch 'feature/subcmd-structure' into develop

    Conflicts:
    	git-flow-feature
    	git-flow-hotfix
    	git-flow-release
    	git-flow-support
    authored January 28, 2010
  2. Vincent Driessen

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

    … 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
    authored January 28, 2010

Jan 27, 2010

  1. Benedikt Böhm

    refactor git config calls to global variables

    authored January 28, 2010
  2. Vincent Driessen

    Refactored the feature, release and support subcommands, too.

    authored January 28, 2010
  3. Benedikt Böhm

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

    …ver.org compliance
    authored January 28, 2010 nvie committed January 28, 2010

Jan 26, 2010

  1. Vincent Driessen

    Don't assume git aliases.

    authored January 26, 2010
  2. Vincent Driessen

    Omit 'v' prefix.

    authored January 26, 2010
  3. Vincent Driessen

    Structurally replace gitflow by git-flow, as a true git extension.

    authored January 26, 2010
  4. Benedikt Böhm

    make git fetch silent

    authored January 26, 2010
Something went wrong with that request. Please try again.