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 Jun 5, 2012
  1. @sinbad

    Fix init -d behaviour when master branch exists, and one or more othe…

    sinbad authored
    …r branch exists, but develop does not
    
    Without this change, init picks 'master' as both the production and integration branch and fails. With it, init detects the clash and behaves the same as if only master exists, picking 'develop' as integration branch
Commits on Nov 29, 2011
  1. @ejholmes
Commits on Nov 28, 2011
  1. @emreberge

    develop_branch uses origin/develop_branch as start-point if one exists.

    emreberge authored
    By default a local develop branch is created of from master regardless if a origin/develop exits. This problem is discussed in issues #137 and #23.
Commits on Feb 14, 2011
Commits on Feb 6, 2011
  1. Rewrite Joseph Levin's solution a bit.

    authored
    Thanks Joseph! I've added you to the AUTHORS file, too.
Commits on Feb 5, 2011
  1. @josephalevin

    Issue: 88

    josephalevin authored
    Added support for using defaults without prompts when using git flow init.
Commits on Jul 9, 2010
Commits on Apr 4, 2010
Commits on Mar 25, 2010
Commits on Mar 23, 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 21, 2010
  1. Check whether this is a freshly git init'ed repo that's still HEADles…

    authored
    …s. In
    
    that case, don't check if the working tree is clean (this yields errors in
    HEADless repos).
    
    This fix enabled users to use "git init && git flow init", too.
Commits on Feb 20, 2010
  1. Add function gitflow_has_prefixes_configured(), to check whether a re…

    authored
    …po is
    
    fully initialized for use with gitflow.
    
    Add a means of only asking for the missing gitflow definitions, not all.
    (Of course, redefining all is always possible using the -f (--force) flag
    of init.)
  2. Allow for setting back a prefix to '' (empty string) by entering '-'

    authored
    (dash), since the empty string '' means "take the default suggestion"
    already. Only needed in rare cases.
  3. Provided a better way of checking whether master/develop branches need

    authored
    initialization and a more user-friendly (and more comprehensable) way of
    asking the user which branches are the master/develop branch.
  4. Always set the gitflow.branch.master and gitflow.branch.develop prope…

    authored
    …rties.
    
    They are required. Their existence tells us that this repository is
    gitflow-enabled.
    
    Added some TODO notes to implement.
  5. Added implementation of git-flow-init that asks the user interactivel…

    authored
    …y what
    
    branches should be used for master and develop and then initializes the Git
    repo itself and/or the git-flow branches for him or her.
Commits on Feb 15, 2010
  1. Fixed a problem with redirection of stdout/stderr. The specifier '2>&1'

    authored
    should come *after* the redirection of stdout to /dev/null. For an
    explanation and a simple demonstration of the differences, see:
    
    	http://is.gd/8srJR
Commits on Feb 9, 2010
Commits on Jan 29, 2010
Commits on Jan 28, 2010
  1. Give all subcommands an optional setup() function that will be called…

    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. Refactored the subcommand invocation logic to form a more hierarchica…

    authored
    …l structure and a cleaner design.
Something went wrong with that request. Please try again.