- 20 Feb, 2010 11 commits
-
-
Vincent Driessen authored
conventions, too.
-
Vincent Driessen authored
-
Vincent Driessen authored
initialization and a more user-friendly (and more comprehensable) way of asking the user which branches are the master/develop branch.
-
Vincent Driessen authored
environment/branches. Added test for existence of local branches.
-
Vincent Driessen authored
-a" returns remote branches with a "remotes/" prefix. "git branch -r" still returns branch names we are used to.
-
Vincent Driessen authored
the variable is set explicitly by gitflow.
-
Vincent Driessen authored
They are required. Their existence tells us that this repository is gitflow-enabled. Added some TODO notes to implement.
-
Vincent Driessen authored
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.
-
Vincent Driessen authored
git branch. Added gitflow_branch_exists() function for testing existence. Let gitflow_test_branches_equal() return with exit code 4 in case of the two branches having no common ancestor.
-
Vincent Driessen authored
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.
-
Vincent Driessen 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).
-
- 19 Feb, 2010 3 commits
-
-
Vincent Driessen authored
-
Vincent Driessen authored
-
Jason L. Shiffer authored
-
- 16 Feb, 2010 2 commits
-
-
Vincent Driessen authored
-
Vincent Driessen authored
still exists one.
-
- 15 Feb, 2010 3 commits
-
-
Vincent Driessen 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
-
Vincent Driessen 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. -
Vincent Driessen authored
-
- 09 Feb, 2010 5 commits
-
-
Vincent Driessen authored
-
Vincent Driessen authored
-
Vincent Driessen authored
-
Vincent Driessen authored
-
Vincent Driessen authored
-
- 08 Feb, 2010 4 commits
-
-
Vincent Driessen authored
-
Vincent Driessen authored
-
Vincent Driessen authored
release/hotfix branch fails finishing, the user may just try so again.
-
Vincent Driessen authored
Require branch and tag to be absent when start is run (for release/hotfix) Require branch to exist when trying to finish (for release/hotfix) Die the finish script when either the fetch, checkout or tagging fails.
-
- 07 Feb, 2010 1 commit
-
-
Vincent Driessen authored
-
- 06 Feb, 2010 3 commits
-
-
Vincent Driessen authored
- Move resolve_name_by_prefix() from git-flow-feature to gitflow-common - Rename require_name() to require_name_arg() - Refactor expanding of nameprefixes
-
Vincent Driessen authored
-
Vincent Driessen 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.
-
- 05 Feb, 2010 1 commit
-
-
Vincent Driessen authored
Renamed shFlags.sh -> gitflow-shFlags
-
- 04 Feb, 2010 5 commits
-
-
Vincent Driessen authored
this feature branch *including* the changes in the current working tree. If an explicit feature branch is named (may be a prefix of a branch name), the diff shows only changes that are already committed.
-
Vincent Driessen 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.
-
Vincent Driessen authored
-
Vincent Driessen authored
-
Vincent Driessen authored
-
- 02 Feb, 2010 2 commits
-
-
Vincent Driessen authored
-
Vincent Driessen authored
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'.
-