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
62345d54f3
Created a second function called gitflow_test_clean_working_tree() that returns error codes instead of dies.
...
Rewrote gitflow_require_clean_working_tree() in terms of that.
2010-01-29 12:41:04 +01:00
Vincent Driessen
49c7d029ec
Initial implementation of merge conflict resolution support.
2010-01-29 12:41:04 +01:00
Vincent Driessen
58995b5b86
Include a globally available variable GIT_DIR, that points to the .git directory.
...
Add a function that tests whether a specific commit is already merged into the given target branch.
2010-01-29 12:40:08 +01:00
Vincent Driessen
17a8112b91
Merge branch 'feature/no-connectivity-for-feature-branches' into develop
2010-01-29 12:39:05 +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
57e7bde9b8
Fix: respect the VERSION_PREFIX in hotfix releases, too.
2010-01-29 12:36:23 +01:00
Vincent Driessen
ab3dc49b8a
Fix: respect the VERSION_PREFIX in hotfix releases, too.
2010-01-29 12:35:49 +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
92b125cfba
Remove pointless check for existence of function setup()
2010-01-28 10:56:54 +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
04839aeffa
Forgot list command for hotfixes.
2010-01-28 01:14:35 +01:00
Vincent Driessen
05caf02aa2
Remove double entry from README.
2010-01-28 01:14:35 +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
fb238a2438
Remove double entry from README.
2010-01-28 00:49:20 +01:00
Benedikt Böhm
7672d99d34
remove useless sanity check
2010-01-28 00:47:46 +01:00
Vincent Driessen
0b378bc7e0
Merge branch 'feature/flip-args' into develop
2010-01-28 00:35:05 +01:00
Vincent Driessen
c81e7a2d5c
Update the README to reflect the new subcommand structure.
2010-01-28 00:33:24 +01:00
Vincent Driessen
3625f3957f
Make git-flow-version a first-class citizen amongst the other subcommands.
2010-01-28 00:21:35 +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
3911e161d9
Also, print the version tag in the summary message, then.
2010-01-27 22:20:47 +01:00
Benedikt Böhm
74a4fe2794
restore &> behaviour but with posix compliant shell syntax
2010-01-28 05:18:23 +08:00
Benedikt Böhm
b22a076431
make version tag prefix configurable so one can use it for github semver.org compliance
2010-01-28 05:18:23 +08: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
4e5c3e9915
In the 'finish release' summary, also exclude the 'v' prefix.
2010-01-27 13:04:41 +01:00
Vincent Driessen
a1db9f1152
Don't prefix tag names with 'v'. If you want that behaviour, include the 'v' on the command line manually.
2010-01-27 13:02:28 +01:00
Vincent Driessen
1f2741aa13
sh builtin command typeset is more portable than declare
2010-01-27 12:55:12 +01:00
Vincent Driessen
2ba9a4da3c
Fix: run git commands in the foreground, instead of the background.
2010-01-27 12:51:07 +01:00
Vincent Driessen
67f781fa37
Add 'uninstall' target, too.
2010-01-27 00:13:32 +01:00
Vincent Driessen
dd720bea91
Dynamically collect the true git exec path and only if that can not be found, use the default. Variable GIT_EXEC_PATH remains overwritable explicitly when given as a command to 'make'.
2010-01-27 00:02:42 +01:00
Vincent Driessen
a7d4527ff3
Don't assume git aliases.
2010-01-26 23:49:47 +01:00
Vincent Driessen
ca2b5175da
Omit 'v' prefix.
2010-01-26 23:49:22 +01:00
Vincent Driessen
9096074b75
Make install arguments compatible with BSD install.
2010-01-26 23:26:57 +01:00
Vincent Driessen
6b95f215a7
Remove TODO file, replaced it by the central issues list on http://github.com/nvie/gitflow/issues
2010-01-26 22:50:24 +01:00
Vincent Driessen
6c2d30bbc4
Structurally replace gitflow by git-flow, as a true git extension.
2010-01-26 22:20:41 +01:00
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