Vincent Driessen
3c337fb5e4
Added -v (--verbose) flags to list subaction of all subcommands.
2010-02-04 11:30:18 +01:00
Vincent Driessen
5455a6f9b1
Allow creation of feature branches even for dirty working trees (using flag -f, --force).
2010-02-03 00:14:05 +01:00
Vincent Driessen
4417492346
Fix: 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.
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'.
2010-02-02 23:57:31 +01:00
Vincent Driessen
eec73c6777
Only push to the origin repo if we wanted to fetch, too.
2010-02-02 16:14:16 +01:00
Vincent Driessen
95bf82c2ab
Add support for the -r (--rebase) option, before doing the actual merge.
2010-02-02 11:58:37 +01:00
Vincent Driessen
9cf5673475
Fix: do integer comparison, not string comparison. wc returns stuff like ' 13', which is perfectly equal to 13.
2010-02-02 11:57:51 +01:00
Vincent Driessen
c62633fbe4
Added initial implementation of the rebase [-i] subcommand.
2010-02-02 10:48:50 +01:00
Vincent Driessen
11b1f41a36
Allow for optional <name> argument in feature diffs. (No name uses the "current" feature branch.)
2010-02-02 06:29:51 +01:00
Vincent Driessen
b03cf963fc
Update options for feature's subcommands in usage.
2010-02-01 22:00:39 +01:00
Vincent Driessen
115609241f
Fix: bug that caused BRANCH variable not to be set correctly.
2010-02-01 21:58:37 +01:00
Vincent Driessen
aa6d016ce6
Implement showing the currently checked out feature branch in feature list
...
overview, very Gitish.
2010-02-01 19:43:46 +01:00
Vincent Driessen
1adbc3e9ca
Dynamically calculate maximal column width used in verbose feature list output.
2010-02-01 15:57:54 +01:00
Vincent Driessen
f2536f4c68
Add initial implementation of the --verbose flag algorithm.
...
Conflicts:
git-flow-feature
2010-02-01 15:57:48 +01:00
Vincent Driessen
1b8192362e
Use shFlags to parse flags given to main and subcommands.
...
Implement the flags for each of the 'feature' subcommands.
2010-02-01 15:55:18 +01:00
Vincent Driessen
1ee37e7231
Fix one old occurence of gitflow_check_ -> gitflow_require_
2010-01-29 17:36:21 +01:00
Vincent Driessen
ea608951a4
Document which subcommands may use the prefix.
2010-01-29 17:00:37 +01:00
Vincent Driessen
8392ed32a3
Doesn't make sense to allow prefix names for commands that require $BRANCH to be absent.
2010-01-29 16:55:38 +01:00
Vincent Driessen
22ef21a136
Further divide the parse_args function up, to support automatic prefix expansion for all subcommands, except for 'feature start'
2010-01-29 16:52:17 +01:00
Vincent Driessen
2e1856b7fd
Implement the basic logic to resolve name prefixes passed to 'flow feature' into their full feature branch names, if unambiguous.
2010-01-29 16:46:33 +01:00
Vincent Driessen
f6f152fff8
Support scenarios where the user might have cancelled a merge in the middle of a merge conflict.
2010-01-29 12:41:25 +01:00
Vincent Driessen
49c7d029ec
Initial implementation of merge conflict resolution support.
2010-01-29 12:41:04 +01:00
Vincent Driessen
2acfffd96a
Make the 'to fetch or not to fetch' flag explicit in the other commands, too.
...
Only difference is that the default equals to:
0 for git-flow-feature
1 for git-flow-{release,hotfix,support}
2010-01-29 12:37:22 +01:00
Vincent Driessen
e034e4a279
Only have network connectivity when explicitly asked for feature branches. This action is so common that it should be quick (very git-ish).
...
For hotfix and release branches, forgetting to update would be an unsafe thing to do, so we leave the fetch in there by default.
2010-01-29 12:10:44 +01:00
Vincent Driessen
48386441c8
Replace gitflow_check_ prefixes by gitflow_require_ prefixes, for consistency.
2010-01-29 10:30:40 +01:00
Vincent Driessen
278884b573
Fix 'feature diff'
2010-01-28 16:29:34 +01:00
Vincent Driessen
46e9c86aff
Merge branch 'feature/subcmd-structure' into develop
...
Conflicts:
git-flow-feature
git-flow-hotfix
git-flow-release
git-flow-support
2010-01-28 01:19:56 +01:00
Vincent Driessen
b866b01ba4
Give all subcommands an optional setup() function that will be called 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
2010-01-28 01:09:28 +01:00
Benedikt Böhm
49dd62b715
refactor git config calls to global variables
2010-01-28 00:51:15 +01:00
Vincent Driessen
170dc747e2
Refactored the feature, release and support subcommands, too.
2010-01-28 00:21:35 +01:00
Vincent Driessen
186d2b5f81
Refactored the subcommand invocation logic to form a more hierarchical structure and a cleaner design.
2010-01-27 23:58:55 +01:00
Vincent Driessen
c51aedf8d0
No feature branches is perfectly OK, so exit clean with code 0.
2010-01-27 14:08:50 +01:00
Vincent Driessen
bd4f095186
Added cmd_list and cmd_diff to git-flow-feature.
2010-01-27 13:57:15 +01:00
Vincent Driessen
6c2d30bbc4
Structurally replace gitflow by git-flow, as a true git extension.
2010-01-26 22:20:41 +01:00
Benedikt Böhm
4d22227a68
make git fetch silent
2010-01-26 14:46:56 +01:00
Benedikt Böhm
83d4361ca5
fix modes
2010-01-26 14:22:41 +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
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