gitflow

nvie/gitflow

Fork 0

mirror of https://github.com/nvie/gitflow.git synced 2026-04-02 18:46:49 +00:00

Commit Graph

Select branches

Hide Pull Requests

develop

feature/implement-hooks

gh-pages

master

#109

#109

#112

#115

#116

#117

#119

#119

#120

#120

#123

#123

#129

#131

#131

#132

#132

#135

#135

#136

#136

#137

#137

#138

#138

#140

#141

#141

#142

#147

#147

#149

#149

#151

#153

#153

#155

#156

#156

#157

#157

#158

#158

#159

#159

#160

#160

#161

#161

#162

#162

#163

#163

#164

#165

#165

#166

#167

#167

#169

#169

#170

#170

#172

#172

#173

#173

#175

#176

#176

#178

#178

#179

#180

#184

#184

#185

#186

#188

#188

#189

#189

#191

#191

#192

#192

#194

#194

#195

#195

#198

#199

#199

#200

#200

#201

#201

#205

#205

#207

#207

#210

#210

#211

#211

#212

#212

#214

#214

#215

#215

#219

#219

#220

#220

#222

#222

#223

#223

#224

#224

#226

#226

#227

#227

#232

#232

#234

#235

#235

#236

#236

#237

#237

#241

#243

#243

#244

#245

#247

#247

#248

#249

#253

#255

#258

#258

#260

#260

#262

#271

#272

#273

#275

#278

#280

#280

#281

#281

#282

#284

#284

#286

#286

#287

#287

#290

#293

#293

#294

#294

#296

#296

#297

#298

#298

#300

#300

#301

#302

#303

#303

#304

#306

#310

#313

#316

#316

#321

#322

#325

#326

#326

#331

#332

#335

#336

#338

#341

#342

#344

#346

#348

#348

#355

#356

#356

#357

#359

#359

#360

#362

#363

#363

#364

#364

#368

#368

#369

#369

#371

#372

#372

#377

#377

#379

#379

#381

#381

#383

#385

#386

#386

#387

#391

#393

#393

#394

#394

#396

#396

#398

#401

#401

#402

#407

#408

#408

#412

#419

#419

#428

#429

#431

#431

#433

#433

#434

#434

#438

#438

#51

#56

#56

#57

#6205

#63

#6347

#6355

#6355

#6358

#6359

#6362

#6362

#6366

#6371

#6371

#6372

#6373

#6374

#6377

#6380

#6380

#6383

#6383

#6385

#6385

#6388

#6394

#6395

#6396

#6396

#6397

#6398

#6398

#6399

#6404

#6404

#6420

#6422

#6423

#6431

#6432

#6434

#6434

#6439

#6449

#6450

#6463

#6467

#6471

#6473

#6480

#6481

#6482

#6485

#6487

#6489

#6492

#6492

#6494

#67

#67

#68

#69

#69

#70

#71

#71

#72

#76

#77

#80

#83

#83

#84

#85

#85

#99

0.1

0.2

0.2.1

0.3

0.4

0.4.1

aaec7b3b72 Merge branch 'feature/allow-diff-without-name-arg' into develop Vincent Driessen 2010-02-02 06:30:56 +01:00
11b1f41a36 Allow for optional <name> argument in feature diffs. (No name uses the "current" feature branch.) Vincent Driessen 2010-02-02 06:29:51 +01:00
b03cf963fc Update options for feature's subcommands in usage. Vincent Driessen 2010-02-01 22:00:39 +01:00
115609241f Fix: bug that caused BRANCH variable not to be set correctly. Vincent Driessen 2010-02-01 21:58:37 +01:00
aa6d016ce6 Implement showing the currently checked out feature branch in feature list overview, very Gitish. Vincent Driessen 2010-02-01 19:43:46 +01:00
e9d2d04e00 Add TODO item for adding installation of shFlags, too. Vincent Driessen 2010-02-01 16:03:07 +01:00
0a5c7307df Merge branch 'feature/verbose-feature-list' into develop Vincent Driessen 2010-02-01 15:58:32 +01:00
1adbc3e9ca Dynamically calculate maximal column width used in verbose feature list output. Vincent Driessen 2010-01-30 16:28:20 +01:00
f2536f4c68 Add initial implementation of the --verbose flag algorithm. Vincent Driessen 2010-02-01 15:57:48 +01:00
60d3d62fb1 Merge branch 'feature/getopt' into develop Vincent Driessen 2010-02-01 15:55:21 +01:00
1b8192362e Use shFlags to parse flags given to main and subcommands. Vincent Driessen 2010-02-01 15:51:43 +01:00
ea58d0f1de Added initial implementation of using shFlags. Vincent Driessen 2010-01-30 20:51:03 +01:00
42600d9b43 Include shFlags repo as a Git submodule. Vincent Driessen 2010-01-30 20:44:19 +01:00
d3bc76028a Merge branch 'feature/allow-prefixes-as-name-arg-on-finish' into develop Vincent Driessen 2010-01-29 17:37:11 +01:00
7ae320bfc5 Fix one old occurence of gitflow_check_ -> gitflow_require_ Vincent Driessen 2010-01-29 17:36:21 +01:00
1ee37e7231 Fix one old occurence of gitflow_check_ -> gitflow_require_ Vincent Driessen 2010-01-29 17:36:21 +01:00
ea608951a4 Document which subcommands may use the prefix. Vincent Driessen 2010-01-29 16:56:29 +01:00
8392ed32a3 Doesn't make sense to allow prefix names for commands that require $BRANCH to be absent. Vincent Driessen 2010-01-29 16:54:39 +01:00
22ef21a136 Further divide the parse_args function up, to support automatic prefix expansion for all subcommands, except for 'feature start' Vincent Driessen 2010-01-29 16:43:37 +01:00
2e1856b7fd Implement the basic logic to resolve name prefixes passed to 'flow feature' into their full feature branch names, if unambiguous. Vincent Driessen 2010-01-29 15:18:13 +01:00
d7cf90abc8 Fixed typo. Vincent Driessen 2010-01-29 14:27:57 +01:00
b4f1d4b878 Added Google Analytics tracker code. Vincent Driessen 2010-01-29 14:25:49 +01:00
ee885cdd5b Added initial project page. Layout was shamelessly ripped by the Github project page of Jonathan Rentzsch's mogenerator project. Vincent Driessen 2010-01-29 14:22:30 +01:00
afb70c99a7 First pages commit Vincent Driessen 2010-01-29 14:04:54 +01:00
a0fe939a6c Merge branch 'feature/merge-conflict-support' into develop Vincent Driessen 2010-01-29 12:42:40 +01:00
f6f152fff8 Support scenarios where the user might have cancelled a merge in the middle of a merge conflict. Vincent Driessen 2010-01-29 10:28:08 +01:00
62345d54f3 Created a second function called gitflow_test_clean_working_tree() that returns error codes instead of dies. Vincent Driessen 2010-01-29 10:27:01 +01:00
49c7d029ec Initial implementation of merge conflict resolution support. Vincent Driessen 2010-01-28 12:40:33 +01:00
58995b5b86 Include a globally available variable GIT_DIR, that points to the .git directory. Vincent Driessen 2010-01-28 12:39:06 +01:00
17a8112b91 Merge branch 'feature/no-connectivity-for-feature-branches' into develop Vincent Driessen 2010-01-29 12:39:05 +01:00
2acfffd96a Make the 'to fetch or not to fetch' flag explicit in the other commands, too. Vincent Driessen 2010-01-29 12:37:22 +01:00
57e7bde9b8 Fix: respect the VERSION_PREFIX in hotfix releases, too. Vincent Driessen 2010-01-29 12:35:49 +01:00
ab3dc49b8a Fix: respect the VERSION_PREFIX in hotfix releases, too. Vincent Driessen 2010-01-29 12:35:49 +01:00
e034e4a279 Only have network connectivity when explicitly asked for feature branches. This action is so common that it should be quick (very git-ish). Vincent Driessen 2010-01-29 12:10:44 +01:00
48386441c8 Replace gitflow_check_ prefixes by gitflow_require_ prefixes, for consistency. Vincent Driessen 2010-01-29 10:30:40 +01:00
278884b573 Fix 'feature diff' Vincent Driessen 2010-01-28 16:29:34 +01:00
92b125cfba Remove pointless check for existence of function setup() Vincent Driessen 2010-01-28 10:56:54 +01:00
46e9c86aff Merge branch 'feature/subcmd-structure' into develop Vincent Driessen 2010-01-28 01:19:56 +01:00
04839aeffa Forgot list command for hotfixes. Vincent Driessen 2010-01-28 01:07:20 +01:00
05caf02aa2 Remove double entry from README. Vincent Driessen 2010-01-28 00:49:20 +01:00
b866b01ba4 Give all subcommands an optional setup() function that will be called by git-flow in order to let the subcommand initialize its environment. Vincent Driessen 2010-01-28 01:01:53 +01:00
49dd62b715 refactor git config calls to global variables Benedikt Böhm 2010-01-28 00:51:15 +01:00
fb238a2438 Remove double entry from README. Vincent Driessen 2010-01-28 00:49:20 +01:00
7672d99d34 remove useless sanity check Benedikt Böhm 2010-01-28 00:47:46 +01:00
0b378bc7e0 Merge branch 'feature/flip-args' into develop Vincent Driessen 2010-01-28 00:35:05 +01:00
c81e7a2d5c Update the README to reflect the new subcommand structure. Vincent Driessen 2010-01-28 00:33:24 +01:00
3625f3957f Make git-flow-version a first-class citizen amongst the other subcommands. Vincent Driessen 2010-01-28 00:13:26 +01:00
170dc747e2 Refactored the feature, release and support subcommands, too. Vincent Driessen 2010-01-28 00:20:51 +01:00
186d2b5f81 Refactored the subcommand invocation logic to form a more hierarchical structure and a cleaner design. Vincent Driessen 2010-01-27 23:48:39 +01:00
3911e161d9 Also, print the version tag in the summary message, then. Vincent Driessen 2010-01-27 22:20:47 +01:00
74a4fe2794 restore &> behaviour but with posix compliant shell syntax Benedikt Böhm 2010-01-28 01:11:29 +08:00
b22a076431 make version tag prefix configurable so one can use it for github semver.org compliance Benedikt Böhm 2010-01-28 01:07:06 +08:00
c51aedf8d0 No feature branches is perfectly OK, so exit clean with code 0. Vincent Driessen 2010-01-27 14:08:50 +01:00
bd4f095186 Added cmd_list and cmd_diff to git-flow-feature. Vincent Driessen 2010-01-27 13:57:15 +01:00
4e5c3e9915 In the 'finish release' summary, also exclude the 'v' prefix. Vincent Driessen 2010-01-27 13:04:41 +01:00
a1db9f1152 Don't prefix tag names with 'v'. If you want that behaviour, include the 'v' on the command line manually. Vincent Driessen 2010-01-27 13:02:28 +01:00
1f2741aa13 sh builtin command typeset is more portable than declare Vincent Driessen 2010-01-27 12:55:12 +01:00
2ba9a4da3c Fix: run git commands in the foreground, instead of the background. Vincent Driessen 2010-01-27 12:51:07 +01:00
67f781fa37 Add 'uninstall' target, too. Vincent Driessen 2010-01-27 00:13:32 +01:00
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'. Vincent Driessen 2010-01-27 00:00:09 +01:00
a7d4527ff3 Don't assume git aliases. Vincent Driessen 2010-01-26 23:49:47 +01:00
ca2b5175da Omit 'v' prefix. Vincent Driessen 2010-01-26 23:49:22 +01:00
9096074b75 Make install arguments compatible with BSD install. Vincent Driessen 2010-01-26 23:26:57 +01:00
6b95f215a7 Remove TODO file, replaced it by the central issues list on http://github.com/nvie/gitflow/issues Vincent Driessen 2010-01-26 22:50:24 +01:00
6c2d30bbc4 Structurally replace gitflow by git-flow, as a true git extension. Vincent Driessen 2010-01-26 22:18:36 +01:00
12c4ab4fb4 Update README file to mention new available features. Vincent Driessen 2010-01-26 22:11:19 +01:00
bd4a1f121f Merge branch 'review' into develop Vincent Driessen 2010-01-26 21:59:33 +01:00
c7bbfcf42d Deliberately add a Makefile target to prevent accidental installation of gitflow. Vincent Driessen 2010-01-26 20:18:10 +01:00
f781242368 Bumped the version number to 0.2 Vincent Driessen 2010-01-26 15:58:32 +01:00
059e68955b Make bump-version write to the new location of git-flow-version Vincent Driessen 2010-01-26 15:58:08 +01:00
427c5dbab5 implement init command Benedikt Böhm 2010-01-26 18:23:44 +01:00
a93a53588c add simple make install target Benedikt Böhm 2010-01-26 14:52:49 +01:00
4d22227a68 make git fetch silent Benedikt Böhm 2010-01-26 14:46:56 +01:00
e2fa4913cc remove bash specific expansions Benedikt Böhm 2010-01-26 14:41:20 +01:00
83d4361ca5 fix modes Benedikt Böhm 2010-01-26 14:22:41 +01:00
7d703a839a Merge branch 'develop' of git://github.com/nvie/gitflow into develop Benedikt Böhm 2010-01-26 13:17:12 +01:00
d2240e4026 Merge branch 'feature/configurable-main-branches' into develop Benedikt Böhm 2010-01-26 13:09:58 +01:00
96f44c0781 make branch prefixes configurable Benedikt Böhm 2010-01-26 13:09:32 +01:00
350e7159f1 make origin configurable Benedikt Böhm 2010-01-26 13:05:05 +01:00
4a864fbc09 make master and develop branch names configurable Benedikt Böhm 2010-01-26 12:59:27 +01:00
4aaec2f734 Fix markdown formatting issues. Vincent Driessen 2010-01-26 12:48:34 +01:00
4ea07a2cc5 set -e conflicts with new sanity checks Benedikt Böhm 2010-01-26 12:48:00 +01:00
2a40e6abad Merge branch 'release-0.1' 0.1 Vincent Driessen 2010-01-26 12:45:37 +01:00
3e970a0bea Merge branch 'release-0.1' into develop Vincent Driessen 2010-01-26 12:45:37 +01:00
e5eaff9557 add bash debug support Benedikt Böhm 2010-01-26 12:44:55 +01:00
f206ba6ce1 Update README file to match the 0.1 release status. Vincent Driessen 2010-01-26 12:44:41 +01:00
00ccea60ae refactor the whole thing Benedikt Böhm 2010-01-26 12:39:36 +01:00
caa5830aa8 Auto-commit version number when bumped. Vincent Driessen 2010-01-26 12:20:58 +01:00
a676509a4a Bumped version number to 0.1 Vincent Driessen 2010-01-26 12:20:40 +01:00
5cdfc2f4b2 Add shell script to automatically changes the version number. Vincent Driessen 2010-01-26 11:55:03 +01:00
463dd443d8 Add static shell variable that specifies the gitflow release version. Vincent Driessen 2010-01-26 11:54:13 +01:00
403fdca36a Fix: btype -> type Vincent Driessen 2010-01-26 11:46:57 +01:00
605b7cd8b4 Functionally implement the gitflow-hotfix subcommand. Vincent Driessen 2010-01-26 10:39:10 +01:00
696b9eb83d Functionally implement the creation/finishing of release branches. Vincent Driessen 2010-01-26 01:15:51 +01:00
be7d416962 Fix: "*" conflicted with markdown syntax Vincent Driessen 2010-01-26 00:56:02 +01:00
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). Vincent Driessen 2010-01-26 00:47:27 +01:00
788227b4ff Merge branch 'make-feature-work' into develop Vincent Driessen 2010-01-26 00:40:59 +01:00
65cdbb7b30 Functionally implemented the gitflow-feature subcommand. Starting and finishing feature branches is now possible in your repos. Vincent Driessen 2010-01-26 00:39:27 +01:00
51fa95dce3 Only mention (warn) when develop is ahead of origin/develop. This is not harmful in any way. Vincent Driessen 2010-01-26 00:23:15 +01:00
144bb5078f Unified notation for stderr file descriptor redirection. Vincent Driessen 2010-01-25 23:55:18 +01:00

... 2 3 4 5 6 ...