Vincent Driessen
ddb350b3f2
Change the URL of the original blog post.
2010-07-09 09:42:09 +02:00
Vincent Driessen
2b829ce7b7
Forgot to update usage text.
2010-07-09 09:36:20 +02:00
Vincent Driessen
4132de9ec4
Allow new feature branches in dirty working trees.
...
Before this change, `git-flow feature start` would nag about the working
tree being dirty and disallow continuation. Then, there were two
alternatives:
- stash away your changes manually, create the new branch, restore the
stash; or
- use `git-flow feature start -f` to force creation
There is absolutely no good reason for git-flow to forbid this creation,
as git allows it already. Therefore, the -f behaviour is now the default,
without an option to turn that behaviour off. Git takes care of unsafe
situations again now.
2010-07-09 09:34:34 +02:00
Vincent Driessen
e761e355f4
Force deletion of the feature branch after finish.
...
This fix also works when feature branches are created manually, based on remote
(i.e. other developers) feature branches, to work on features together.
`git branch -d` won't remove local feature branches that are set up to track
remote branches, `-D` will.
Fixes ticket #31 .
2010-07-08 14:41:14 +02:00
Vincent Driessen
06a5de7111
Forgot to mention Jason L. Shiffer in AUTHORS file.
...
Sorry!
2010-07-08 14:00:21 +02:00
Vincent Driessen
e4badddb56
Added Randy Merrill to the AUTHORS.
2010-07-05 14:21:59 +02:00
Randy Merrill
4de01f2572
Adding an extra line to the output for extra spacing.
2010-06-30 03:04:15 +08:00
Randy Merrill
b681b4522d
Adding extra instructions when running the list option without any corresponding branches found.
2010-06-30 03:04:15 +08:00
Vincent Driessen
a2baef9587
Added alias 'co' for new 'checkout' subcommand.
2010-05-27 11:52:31 -07:00
Vincent Driessen
5b05ad78d1
Fix: incorrect order of arguments in determining whether local branch exists.
2010-05-27 11:51:50 -07:00
Vincent Driessen
d43ab849eb
Added 'feature checkout' subcommand.
...
This can be used as a shortcut to "git checkout feature/full-feature-name".
Feature branch prefix names may be used for convenience.
2010-05-27 11:26:01 -07:00
Vincent Driessen
c118a85b44
Fix: unnecessary requirement of origin when creating a new feature branch.
...
Only test if local branch is behind origin if origin exists.
2010-04-04 16:32:04 +02:00
Vincent Driessen
d79a0d45d3
Added referral link to the AUTHORS file.
2010-04-04 16:11:44 +02:00
Vincent Driessen
d72acbaf7d
Added inline license terms to all source files.
2010-04-04 16:10:17 +02:00
Vincent Driessen
72c4f94a53
Whitespace issue.
2010-04-04 16:09:56 +02:00
Vincent Driessen
2e1579f760
Added AUTHORS file.
2010-04-04 16:07:57 +02:00
Vincent Driessen
5d1dbe7405
Added (BSD) licensing terms to the project.
2010-04-04 15:52:55 +02:00
gmallard
192ff525ea
Correct advisory message. Wording was reversed.
2010-04-01 19:31:09 -04:00
Vincent Driessen
b5500d4b3a
Removed left-behind helper functions in git-flow.
...
They were left behind in the main git-flow script, since they are moved
over to gitflow-common.
2010-03-25 15:41:56 +01:00
Vincent Driessen
3176f74eb9
Explicitly avoid setting up tracking between develop and master.
2010-03-25 15:30:58 +01:00
Vincent Driessen
f6228ed8aa
Replace \c-terminated echo calls by more portable printf calls.
2010-03-23 21:19:54 +01:00
Vincent Driessen
b1033aa3d3
gitflow-init honors global gitflow configuration that may exist before a
...
new repo is created.
2010-03-23 21:10:13 +01:00
Vincent Driessen
477a88d84b
Merge branch 'hotfix/0.2.1' into develop
2010-03-19 19:37:18 +01:00
Vincent Driessen
e0b54c070a
Strip the GIT_EXEC_PATH Makefile parameter. Replaced it by the more Unixy
...
``prefix''. There is no need to install git-flow inside git's libexec dir by
default. It just needs to be *somewhere* on the PATH.
2010-03-19 19:27:38 +01:00
Vincent Driessen
133c43c8d8
Bump the version number to 0.2.1
2010-03-19 19:27:19 +01:00
Vincent Driessen
b554186c4c
Merge branch 'release/0.2' into develop
2010-02-24 01:56:06 +01:00
Vincent Driessen
097459c5c5
Merge branch 'release/0.2'
2010-02-24 01:52:51 +01:00
Vincent Driessen
4fc0bc1601
Use a more friendly URL for the original blog post URL.
2010-02-24 01:43:04 +01:00
Vincent Driessen
0465a6d5d0
Bumped version number to 0.2
2010-02-24 01:42:24 +01:00
Vincent Driessen
a2e4116333
Document all available flags in all of the subcommand synopsis texts.
2010-02-24 01:37:07 +01:00
Vincent Driessen
c49c793a9a
Dotted i's and crossed t's in the README file, for release.
2010-02-24 01:22:48 +01:00
Vincent Driessen
05e658683a
Removed the --squash option until it's fully implemented.
2010-02-22 21:09:30 +01:00
Vincent Driessen
e0d8af3bec
Fix: endswith() implementation actually was a startswith() implementation.
2010-02-22 12:21:59 +01:00
Vincent Driessen
f9ebb076ba
Added 'git flow init' to the README file.
2010-02-22 07:56:04 +01:00
Vincent Driessen
f10a48bbbd
Merge branch 'feature/fix-gitflow-function-prefixes' into develop
2010-02-22 07:46:12 +01:00
Vincent Driessen
6ee6223dc1
Fix: bug introduced in b25ab83334
2010-02-22 07:45:24 +01:00
Vincent Driessen
55c15539fa
Reorder functions: Super-common functions go first, then all git-specific
...
functions, then gitflow-specific functions and finally, assertions to use
in gitflow subcommands.
2010-02-22 07:28:27 +01:00
Vincent Driessen
7832d6efb9
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
2010-02-22 07:18:34 +01:00
Vincent Driessen
677334c60a
Fix: put auto-detected Makefile path into a variable, but keep
...
GIT_EXEC_PATH overrideable via Makefile command arguments.
2010-02-21 11:48:23 +01:00
Vincent Driessen
6d74722d72
Merge branch 'feature/init-errors' into develop
2010-02-21 11:46:57 +01:00
Vincent Driessen
ef43cbd661
Check whether this is a freshly git init'ed repo that's still HEADless. 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.
2010-02-21 11:41:36 +01:00
Vincent Driessen
c1598bf2cf
Added function gitflow_require_initialized(), to assert that the gitflow
...
variables are all set (they need to be set explicitly once).
2010-02-20 22:26:14 +01:00
Vincent Driessen
1d8bb0d11a
Add function gitflow_has_prefixes_configured(), to check whether a repo 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.)
2010-02-20 22:26:14 +01:00
Vincent Driessen
9ddb1dca68
Allow for setting back a prefix to '' (empty string) by entering '-'
...
(dash), since the empty string '' means "take the default suggestion"
already. Only needed in rare cases.
2010-02-20 22:26:13 +01:00
Vincent Driessen
f476d260b0
While we're user input in git flow init, ask the user for all prefix
...
conventions, too.
2010-02-20 22:26:06 +01:00
Vincent Driessen
3227d8027f
Only switch to develop branch if it's newly created.
2010-02-20 16:33:13 +01:00
Vincent Driessen
131c2988c6
Provided a better way of checking whether master/develop branches need
...
initialization and a more user-friendly (and more comprehensable) way of
asking the user which branches are the master/develop branch.
2010-02-20 16:33:13 +01:00
Vincent Driessen
b25ab83334
Added tests for asserting correctly configured git-flow
...
environment/branches.
Added test for existence of local branches.
2010-02-20 16:33:13 +01:00
Vincent Driessen
4e11dd6f21
Changed implementation of gitflow_all_branches() subtly, since "git branch
...
-a" returns remote branches with a "remotes/" prefix. "git branch -r"
still returns branch names we are used to.
2010-02-20 16:33:13 +01:00
Vincent Driessen
cf6e92abc2
Changed GIT_DIR variable into DOT_GIT_DIR, since Git uses it and chokes if
...
the variable is set explicitly by gitflow.
2010-02-20 16:33:13 +01:00