Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Feb 20, 2010
  1. 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.
Commits on Feb 15, 2010
  1. Fixed a problem with redirection of stdout/stderr. The specifier '2>&1'

    should come *after* the redirection of stdout to /dev/null. For an
    explanation and a simple demonstration of the differences, see:

  2. 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 5, 2010
  1. Put all common functions into separate file gitflow-common.

    Renamed -> gitflow-shFlags
Commits on Feb 4, 2010
Commits on Feb 2, 2010
  1. Fix: Of course, in sh, true=0 and false=1. In order to never mess thi…

    …s up
    again, the convenience functions flag() and noflag() have been used and
    all occurrences of 0 and 1 are replaces by true and false. This makes it
    safe (and more readable!) to test for active/inactive flags.
    Also specify $FLAGS_PARENT explicitly, to avoid having the generated usage
    texts by shFlags mention the full Unix path to $0, but instead use the
    more recognizable varient 'git flow feature'.
  2. Added a nicer way of installing/uninstalling git-flow.

    Now also installs the script. (The license lines are included in its header.)
  3. use correct name of shFlags

    Stefan Naewe authored committed
    Signed-off-by: Stefan Naewe <>
  4. Fix: quote arg to typeset

Commits on Feb 1, 2010
  1. Use shFlags to parse flags given to main and subcommands.

    Implement the flags for each of the 'feature' subcommands.
Commits on Jan 30, 2010
Commits on Jan 29, 2010
  1. Created a second function called gitflow_test_clean_working_tree() th…

    …at returns error codes instead of dies.
    Rewrote gitflow_require_clean_working_tree() in terms of that.
  2. Include a globally available variable GIT_DIR, that points to the .gi…

    …t directory.
    Add a function that tests whether a specific commit is already merged into the given target branch.
Commits on Jan 28, 2010
  1. Merge branch 'feature/subcmd-structure' into develop

  2. 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
Commits on Jan 27, 2010
  1. @hollow

    remove useless sanity check

    hollow authored
  2. Refactored the subcommand invocation logic to form a more hierarchica…

    …l structure and a cleaner design.
  3. @hollow

    restore &> behaviour but with posix compliant shell syntax

    hollow authored committed
Commits on Jan 26, 2010
  1. @hollow

    implement init command

    hollow authored
  2. @hollow

    remove bash specific expansions

    hollow authored
  3. @hollow
  4. @hollow

    make origin configurable

    hollow authored
  5. @hollow
  6. @hollow
  7. @hollow

    add bash debug support

    hollow authored
  8. @hollow

    refactor the whole thing

    hollow authored
    - now works as sub commands to git if copied to $(git --exec-path)
    - now works with arbitrary commands for branch types
    - consistent variable names
    - new branch type 'support' for long-term support branches of historic
    - preliminary base branch support for hotfix branch type to create
      hotfixes form support branches
Something went wrong with that request. Please try again.