7c4cc65963Bump version to 0.3.
Vincent Driessen
2010-07-22 16:14:08 +0200
02548fb79fFix minor markdown issue and credit contributers.
Vincent Driessen
2010-07-22 16:12:26 +0200
2da8810fa0Add a Changelog, for keeping a clean overview of what changed.
Vincent Driessen
2010-07-22 16:03:22 +0200
de95e004abChange the default behaviour of all scripts to NOT fetch.
Vincent Driessen
2010-07-22 15:11:17 +0200
ec0b854b3eAdd link to git-flow-completion project.
Vincent Driessen
2010-07-22 14:57:16 +0200
d76add9ee2Remove "important" 0.2 message.
Vincent Driessen
2010-07-22 14:56:30 +0200
79d4b4fef3Add Mark to AUTHORS.
Vincent Driessen
2010-07-21 13:31:36 +0200
cb654b189eFix whitespace issues.
Vincent Driessen
2010-07-21 13:28:54 +0200
8a86c48a1bFinishing features now only update / and / if they exists, this allows you to work on a unpushed repo, or a git svn repo
Mark Derricutt
2010-07-20 21:11:48 +1200
1911101cc2Fix markdown issue.
Vincent Driessen
2010-07-15 23:21:55 -0700
1fd5bcfee6Added link to Google group.
Vincent Driessen
2010-07-15 23:21:21 -0700
309e74f988Bumped version number to 0.3-dev
Vincent Driessen
2010-07-11 10:55:54 +0200
4f0f539130Added Rick Osborne's super-easy gitflow installer oneliner to the project.
Vincent Driessen
2010-07-10 17:05:27 +0200
f68d405cc3Added new experimental feature pull subcommand.
Vincent Driessen
2010-07-09 12:34:18 +0200
ddb350b3f2Change the URL of the original blog post.
Vincent Driessen
2010-07-09 09:42:09 +0200
2b829ce7b7Forgot to update usage text.
Vincent Driessen
2010-07-09 09:36:20 +0200
4132de9ec4Allow new feature branches in dirty working trees.
Vincent Driessen
2010-07-09 09:30:09 +0200
e761e355f4Force deletion of the feature branch after finish.
Vincent Driessen
2010-07-08 14:41:14 +0200
06a5de7111Forgot to mention Jason L. Shiffer in AUTHORS file.
Vincent Driessen
2010-07-08 13:59:54 +0200
e4badddb56Added Randy Merrill to the AUTHORS.
Vincent Driessen
2010-07-05 14:21:59 +0200
4de01f2572Adding an extra line to the output for extra spacing.
Randy Merrill
2010-06-26 13:19:06 +0800
b681b4522dAdding extra instructions when running the list option without any corresponding branches found.
Randy Merrill
2010-06-26 13:14:15 +0800
a2baef9587Added alias 'co' for new 'checkout' subcommand.
Vincent Driessen
2010-05-27 11:52:31 -0700
5b05ad78d1Fix: incorrect order of arguments in determining whether local branch exists.
Vincent Driessen
2010-05-27 11:51:50 -0700
d43ab849ebAdded 'feature checkout' subcommand.
Vincent Driessen
2010-05-27 11:26:01 -0700
c118a85b44Fix: unnecessary requirement of origin when creating a new feature branch.
Vincent Driessen
2010-04-04 16:32:04 +0200
d79a0d45d3Added referral link to the AUTHORS file.
Vincent Driessen
2010-04-04 16:11:44 +0200
d72acbaf7dAdded inline license terms to all source files.
Vincent Driessen
2010-04-04 16:10:17 +0200
72c4f94a53Whitespace issue.
Vincent Driessen
2010-04-04 16:09:56 +0200
2e1579f760Added AUTHORS file.
Vincent Driessen
2010-04-04 16:07:57 +0200
5d1dbe7405Added (BSD) licensing terms to the project.
Vincent Driessen
2010-04-04 15:52:55 +0200
192ff525eaCorrect advisory message. Wording was reversed.
gmallard
2010-04-01 19:31:09 -0400
b5500d4b3aRemoved left-behind helper functions in git-flow.
Vincent Driessen
2010-03-25 15:41:56 +0100
3176f74eb9Explicitly avoid setting up tracking between develop and master.
Vincent Driessen
2010-03-25 15:30:58 +0100
f6228ed8aaReplace \c-terminated echo calls by more portable printf calls.
Vincent Driessen
2010-03-23 21:19:54 +0100
b1033aa3d3gitflow-init honors global gitflow configuration that may exist before a new repo is created.
Vincent Driessen
2010-03-23 21:10:13 +0100
477a88d84bMerge branch 'hotfix/0.2.1' into develop
Vincent Driessen
2010-03-19 19:37:18 +0100
f8ea3ebae2Merge branch 'hotfix/0.2.1'
0.2.1
Vincent Driessen
2010-03-19 19:31:59 +0100
e0b54c070aStrip 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.
Vincent Driessen
2010-03-19 19:27:38 +0100
133c43c8d8Bump the version number to 0.2.1
Vincent Driessen
2010-03-19 19:27:19 +0100
b554186c4cMerge branch 'release/0.2' into develop
0.2
Vincent Driessen
2010-02-24 01:56:06 +0100
097459c5c5Merge branch 'release/0.2'
Vincent Driessen
2010-02-24 01:52:51 +0100
4fc0bc1601Use a more friendly URL for the original blog post URL.
Vincent Driessen
2010-02-24 01:43:04 +0100
0465a6d5d0Bumped version number to 0.2
Vincent Driessen
2010-02-24 01:42:24 +0100
a2e4116333Document all available flags in all of the subcommand synopsis texts.
Vincent Driessen
2010-02-24 01:37:07 +0100
c49c793a9aDotted i's and crossed t's in the README file, for release.
Vincent Driessen
2010-02-24 01:22:48 +0100
05e658683aRemoved the --squash option until it's fully implemented.
Vincent Driessen
2010-02-22 21:09:30 +0100
e0d8af3becFix: endswith() implementation actually was a startswith() implementation.
Vincent Driessen
2010-02-22 12:21:36 +0100
f9ebb076baAdded 'git flow init' to the README file.
Vincent Driessen
2010-02-22 07:56:04 +0100
f10a48bbbdMerge branch 'feature/fix-gitflow-function-prefixes' into develop
Vincent Driessen
2010-02-22 07:46:12 +0100
6ee6223dc1Fix: bug introduced in b25ab83334
Vincent Driessen
2010-02-22 07:45:24 +0100
55c15539faReorder functions: Super-common functions go first, then all git-specific functions, then gitflow-specific functions and finally, assertions to use in gitflow subcommands.
Vincent Driessen
2010-02-22 07:28:27 +0100
7832d6efb9Better naming of common functions categorizing them into common, git specific and git-flow specific functions:
Vincent Driessen
2010-02-21 21:31:03 +0100
677334c60aFix: put auto-detected Makefile path into a variable, but keep GIT_EXEC_PATH overrideable via Makefile command arguments.
Vincent Driessen
2010-02-21 11:48:23 +0100
6d74722d72Merge branch 'feature/init-errors' into develop
Vincent Driessen
2010-02-21 11:46:57 +0100
ef43cbd661Check 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).
Vincent Driessen
2010-02-21 11:20:05 +0100
c1598bf2cfAdded function gitflow_require_initialized(), to assert that the gitflow variables are all set (they need to be set explicitly once).
Vincent Driessen
2010-02-20 16:52:48 +0100
1d8bb0d11aAdd function gitflow_has_prefixes_configured(), to check whether a repo is fully initialized for use with gitflow.
Vincent Driessen
2010-02-20 16:46:38 +0100
9ddb1dca68Allow 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.
Vincent Driessen
2010-02-20 16:30:11 +0100
f476d260b0While we're user input in git flow init, ask the user for all prefix conventions, too.
Vincent Driessen
2010-02-20 16:23:47 +0100
3227d8027fOnly switch to develop branch if it's newly created.
Vincent Driessen
2010-02-20 16:13:23 +0100
131c2988c6Provided 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.
Vincent Driessen
2010-02-20 14:30:16 +0100
b25ab83334Added tests for asserting correctly configured git-flow environment/branches.
Vincent Driessen
2010-02-20 11:21:23 +0100
4e11dd6f21Changed 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.
Vincent Driessen
2010-02-19 19:48:23 +0100
cf6e92abc2Changed GIT_DIR variable into DOT_GIT_DIR, since Git uses it and chokes if the variable is set explicitly by gitflow.
Vincent Driessen
2010-02-19 19:44:48 +0100
61882067afAlways set the gitflow.branch.master and gitflow.branch.develop properties. They are required. Their existence tells us that this repository is gitflow-enabled.
Vincent Driessen
2010-02-18 12:32:20 +0100
0161de584cAdded implementation of git-flow-init that asks the user interactively 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.
Vincent Driessen
2010-02-18 12:07:34 +0100
49094bd9c6Change implementation of gitflow_all_branches() to get its result directly from git branch.
Vincent Driessen
2010-02-18 12:05:01 +0100
d72e4aceedRewrite the way git-flow initialized its variables in git-flow and assumed 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.
Vincent Driessen
2010-02-16 21:33:51 +0100
21c7aa9c8bDon'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).
Vincent Driessen
2010-02-16 20:57:35 +0100
b3e89fe50bMerge branch 'zerotao-patch' into develop
Vincent Driessen
2010-02-19 06:43:21 +0100
ddba2df936Fix spacing issues.
Vincent Driessen
2010-02-19 06:42:18 +0100
6809f0e478Added push option (-p) to hotfix and release
Jason L. Shiffer
2010-02-18 23:57:08 -0500
d44eaf90e8Merge branch 'feature/compliance' into develop
Vincent Driessen
2010-02-16 15:13:47 +0100
6d64d2c340Add check to disallow creation of a new release/hotfix branch when there still exists one.
Vincent Driessen
2010-02-16 06:41:13 +0100
283b0f708dFixed 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:
Vincent Driessen
2010-02-15 23:23:14 +0100
f46e2903cfReplaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on:
Vincent Driessen
2010-02-15 23:01:52 +0100
13c94821e7Added instructions to first fetch submodules before installing.
Vincent Driessen
2010-02-15 20:09:02 +0100
99c80527d7Merge branch 'feature/quote-all-var-params' into develop
Vincent Driessen
2010-02-10 00:45:31 +0100
b673c44595Better (less complex) way of counting the branch name length.
Vincent Driessen
2010-02-10 00:43:53 +0100
6884523527Use space (' ') instead of '?' as a pattern terminator.
Vincent Driessen
2010-02-10 00:43:21 +0100
a4dd223d5bQuote all variables in function/program arguments.
Vincent Driessen
2010-02-10 00:34:59 +0100
c5fcc01adbDo not quote variable assignments.
Vincent Driessen
2010-02-10 00:18:08 +0100
fafa2b28beMerge branch 'feature/annotated-signed-tags' into develop
Vincent Driessen
2010-02-09 00:55:38 +0100
d29e315f87Annotated the code with some TODO-notes.
Vincent Driessen
2010-02-09 00:55:06 +0100
5fa4758e54Made the finishing of release/hotfix branches fail-safe. When a release/hotfix branch fails finishing, the user may just try so again.
Vincent Driessen
2010-02-09 00:31:33 +0100
1a2868b8b4Add tag annotation and tag signing to both release and hotfix.
Vincent Driessen
2010-02-07 23:23:16 +0100
ca73caf8c5Replaced all old-style flag variables by shFlags-style flag variables.
Vincent Driessen
2010-02-07 19:46:38 +0100
d099126fe5Tidying up:
Vincent Driessen
2010-02-06 21:19:07 +0100
886c9e1531Merge branch 'feature/tidy-up' into develop
Vincent Driessen
2010-02-06 15:00:03 +0100
27592dd732Tidy up:
Vincent Driessen
2010-02-06 14:45:39 +0100
c3607ac2e8Put all common functions into separate file gitflow-common.
Vincent Driessen
2010-02-05 19:53:45 +0100
5474e46a73If feature diff is called without arguments, compare the changes made in this feature branch *including* the changes in the current working tree.
Vincent Driessen
2010-02-04 15:50:06 +0100
010252a8a9Added an optional <base> argument to all start subactions.
Vincent Driessen
2010-02-04 10:31:29 +0100
9277024410Fix: error message for "Unknown subcommand"
Vincent Driessen
2010-02-04 11:49:47 +0100
3c337fb5e4Added -v (--verbose) flags to list subaction of all subcommands.
Vincent Driessen
2010-02-04 11:30:18 +0100
c7ea9b2236Fix: add init to Makefile.
Vincent Driessen
2010-02-04 10:22:13 +0100
5455a6f9b1Allow creation of feature branches even for dirty working trees (using flag -f, --force).
Vincent Driessen
2010-02-03 00:14:05 +0100
4417492346Fix: Of course, in sh, true=0 and false=1. In order to never mess this 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.
Vincent Driessen
2010-02-02 23:53:21 +0100