Vincent Driessen
12c4ab4fb4
Update README file to mention new available features.
2010-01-26 22:11:19 +01:00
Vincent Driessen
bd4a1f121f
Merge branch 'review' into develop
2010-01-26 21:59:33 +01:00
Vincent Driessen
c7bbfcf42d
Deliberately add a Makefile target to prevent accidental installation of gitflow.
2010-01-26 20:18:10 +01:00
Vincent Driessen
f781242368
Bumped the version number to 0.2
2010-01-26 20:06:42 +01:00
Vincent Driessen
059e68955b
Make bump-version write to the new location of git-flow-version
2010-01-26 20:06:36 +01:00
Benedikt Böhm
427c5dbab5
implement init command
2010-01-26 18:23:44 +01:00
Benedikt Böhm
a93a53588c
add simple make install target
2010-01-26 14:52:49 +01:00
Benedikt Böhm
4d22227a68
make git fetch silent
2010-01-26 14:46:56 +01:00
Benedikt Böhm
e2fa4913cc
remove bash specific expansions
2010-01-26 14:41:20 +01:00
Benedikt Böhm
83d4361ca5
fix modes
2010-01-26 14:22:41 +01:00
Benedikt Böhm
7d703a839a
Merge branch 'develop' of git://github.com/nvie/gitflow into develop
...
Conflicts:
gitflow
2010-01-26 13:17:12 +01:00
Benedikt Böhm
d2240e4026
Merge branch 'feature/configurable-main-branches' into develop
2010-01-26 13:09:58 +01:00
Benedikt Böhm
96f44c0781
make branch prefixes configurable
2010-01-26 13:09:32 +01:00
Benedikt Böhm
350e7159f1
make origin configurable
2010-01-26 13:05:05 +01:00
Benedikt Böhm
4a864fbc09
make master and develop branch names configurable
2010-01-26 12:59:27 +01:00
Vincent Driessen
4aaec2f734
Fix markdown formatting issues.
2010-01-26 12:48:34 +01:00
Benedikt Böhm
4ea07a2cc5
set -e conflicts with new sanity checks
2010-01-26 12:48:00 +01:00
Vincent Driessen
3e970a0bea
Merge branch 'release-0.1' into develop
2010-01-26 12:45:37 +01:00
Benedikt Böhm
e5eaff9557
add bash debug support
2010-01-26 12:44:55 +01:00
Vincent Driessen
f206ba6ce1
Update README file to match the 0.1 release status.
2010-01-26 12:44:41 +01:00
Benedikt Böhm
00ccea60ae
refactor the whole thing
...
- 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
versions
- preliminary base branch support for hotfix branch type to create
hotfixes form support branches
2010-01-26 12:39:36 +01:00
Vincent Driessen
caa5830aa8
Auto-commit version number when bumped.
2010-01-26 12:25:16 +01:00
Vincent Driessen
a676509a4a
Bumped version number to 0.1
2010-01-26 12:20:40 +01:00
Vincent Driessen
5cdfc2f4b2
Add shell script to automatically changes the version number.
2010-01-26 11:55:03 +01:00
Vincent Driessen
463dd443d8
Add static shell variable that specifies the gitflow release version.
2010-01-26 11:54:13 +01:00
Vincent Driessen
403fdca36a
Fix: btype -> type
2010-01-26 11:46:57 +01:00
Vincent Driessen
605b7cd8b4
Functionally implement the gitflow-hotfix subcommand.
2010-01-26 10:39:10 +01:00
Vincent Driessen
696b9eb83d
Functionally implement the creation/finishing of release branches.
2010-01-26 09:08:15 +01:00
Vincent Driessen
be7d416962
Fix: "*" conflicted with markdown syntax
2010-01-26 00:56:02 +01:00
Vincent Driessen
938b0736f3
Don't do --no-ff merges for feature branches that exist of a single commit (no benefits are gained in those situations, only complexity is added).
2010-01-26 00:47:27 +01:00
Vincent Driessen
788227b4ff
Merge branch 'make-feature-work' into develop
2010-01-26 00:40:59 +01:00
Vincent Driessen
65cdbb7b30
Functionally implemented the gitflow-feature subcommand. Starting and finishing feature branches is now possible in your repos.
2010-01-26 00:39:27 +01:00
Vincent Driessen
51fa95dce3
Only mention (warn) when develop is ahead of origin/develop. This is not harmful in any way.
2010-01-26 00:23:15 +01:00
Vincent Driessen
144bb5078f
Unified notation for stderr file descriptor redirection.
2010-01-25 23:55:18 +01:00
Vincent Driessen
7238e29564
Use a safer, more reliable way of determining what branches are available, by parsing the 'git branch' output instead of depending on files in the FS.
2010-01-25 23:52:26 +01:00
Vincent Driessen
377949c132
Added a TODO list for jotting down notes for future versions.
2010-01-25 23:34:54 +01:00
Vincent Driessen
b26c32fc29
Remove test-sh-setup test file.
2010-01-25 22:41:42 +01:00
Vincent Driessen
ec2c895cef
Add extra line to error message for clarification.
2010-01-25 22:40:13 +01:00
Vincent Driessen
ab4b80d5b3
Merge branch 'ensure-clean-env' into develop
2010-01-25 22:16:57 +01:00
Vincent Driessen
3d41255579
Add checks for all the commands, to assure we're working in a clean and safe environment, before actually modifying stuff in the repo.
2010-01-25 22:16:08 +01:00
Vincent Driessen
6c9e8049a9
Add function gitflow_require_branch_absent(), to test for the *absence* of a branch.
2010-01-25 21:59:10 +01:00
Vincent Driessen
a1bc8717e2
Implemented the gitflow_check_clean_working_tree() check for dirty directories.
2010-01-25 21:50:08 +01:00
Vincent Driessen
afee9fdfed
Add function gitflow_require_branches_equal() to test whether local and remote branches have diverged.
2010-01-25 17:29:29 +01:00
Vincent Driessen
a0434cad2e
Add warn() function and redefine die() in terms of warn.
2010-01-25 17:28:22 +01:00
Vincent Driessen
4f1cc33044
Added functions for assuring branches are in place before doing the actual work.
...
- gitflow_require_local_branch()
- gitflow_require_remote_branch()
- gitflow_require_branch()
2010-01-25 16:44:57 +01:00
Daniel Truemper
7d0a4096f7
Merge branch 'tag-releases' into develop
2010-01-25 09:48:14 +01:00
Daniel Truemper
3ba8b3d676
tag each release
2010-01-25 09:47:59 +01:00
Daniel Truemper
e17663f887
Merge branch 'cleanup' into develop
2010-01-24 12:14:36 +01:00
Daniel Truemper
e4736ce59f
duplicate method removed
2010-01-24 12:14:13 +01:00
Daniel Truemper
21c3483326
allow optional argument to the feature subcommand
2010-01-24 12:11:15 +01:00