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

Mono Color

• 309e74f988 Bumped version number to 0.3-dev Vincent Driessen 2010-07-11 10:55:54 +02:00
• 4f0f539130 Added Rick Osborne's super-easy gitflow installer oneliner to the project. Vincent Driessen 2010-07-10 17:05:27 +02:00
• f68d405cc3 Added new experimental feature pull subcommand. Vincent Driessen 2010-07-09 12:34:18 +02:00
• ddb350b3f2 Change the URL of the original blog post. Vincent Driessen 2010-07-09 09:42:09 +02:00
• 2b829ce7b7 Forgot to update usage text. Vincent Driessen 2010-07-09 09:36:20 +02:00
• 4132de9ec4 Allow new feature branches in dirty working trees. Vincent Driessen 2010-07-09 09:30:09 +02:00
• e761e355f4 Force deletion of the feature branch after finish. Vincent Driessen 2010-07-08 14:41:14 +02:00
• 06a5de7111 Forgot to mention Jason L. Shiffer in AUTHORS file. Vincent Driessen 2010-07-08 13:59:54 +02:00
• e4badddb56 Added Randy Merrill to the AUTHORS. Vincent Driessen 2010-07-05 14:21:59 +02:00
• 4de01f2572 Adding an extra line to the output for extra spacing. Randy Merrill 2010-06-26 13:19:06 +08:00
• b681b4522d Adding extra instructions when running the list option without any corresponding branches found. Randy Merrill 2010-06-26 13:14:15 +08:00
• a2baef9587 Added alias 'co' for new 'checkout' subcommand. Vincent Driessen 2010-05-27 11:52:31 -07:00
• 5b05ad78d1 Fix: incorrect order of arguments in determining whether local branch exists. Vincent Driessen 2010-05-27 11:51:50 -07:00
• d43ab849eb Added 'feature checkout' subcommand. Vincent Driessen 2010-05-27 11:26:01 -07:00
• c118a85b44 Fix: unnecessary requirement of origin when creating a new feature branch. Vincent Driessen 2010-04-04 16:32:04 +02:00
• d79a0d45d3 Added referral link to the AUTHORS file. Vincent Driessen 2010-04-04 16:11:44 +02:00
• d72acbaf7d Added inline license terms to all source files. Vincent Driessen 2010-04-04 16:10:17 +02:00
• 72c4f94a53 Whitespace issue. Vincent Driessen 2010-04-04 16:09:56 +02:00
• 2e1579f760 Added AUTHORS file. Vincent Driessen 2010-04-04 16:07:57 +02:00
• 5d1dbe7405 Added (BSD) licensing terms to the project. Vincent Driessen 2010-04-04 15:52:55 +02:00
• 192ff525ea Correct advisory message. Wording was reversed. gmallard 2010-04-01 19:31:09 -04:00
• b5500d4b3a Removed left-behind helper functions in git-flow. Vincent Driessen 2010-03-25 15:41:56 +01:00
• 3176f74eb9 Explicitly avoid setting up tracking between develop and master. Vincent Driessen 2010-03-25 15:30:58 +01:00
• f6228ed8aa Replace \c-terminated echo calls by more portable printf calls. Vincent Driessen 2010-03-23 21:19:54 +01:00
• b1033aa3d3 gitflow-init honors global gitflow configuration that may exist before a new repo is created. Vincent Driessen 2010-03-23 21:10:13 +01:00
• 477a88d84b Merge branch 'hotfix/0.2.1' into develop Vincent Driessen 2010-03-19 19:37:18 +01:00
• f8ea3ebae2 Merge branch 'hotfix/0.2.1' 0.2.1 Vincent Driessen 2010-03-19 19:31:59 +01:00
• e0b54c070a Strip 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 +01:00
• 133c43c8d8 Bump the version number to 0.2.1 Vincent Driessen 2010-03-19 19:27:19 +01:00
• 9975a12309 Added GA-enabled weblink. gh-pages Vincent Driessen 2010-02-24 02:03:56 +01:00
• b554186c4c Merge branch 'release/0.2' into develop 0.2 Vincent Driessen 2010-02-24 01:56:06 +01:00
• 097459c5c5 Merge branch 'release/0.2' Vincent Driessen 2010-02-24 01:52:51 +01:00
• 4fc0bc1601 Use a more friendly URL for the original blog post URL. Vincent Driessen 2010-02-24 01:43:04 +01:00
• 0465a6d5d0 Bumped version number to 0.2 Vincent Driessen 2010-02-24 01:42:24 +01:00
• a2e4116333 Document all available flags in all of the subcommand synopsis texts. Vincent Driessen 2010-02-24 01:37:07 +01:00
• c49c793a9a Dotted i's and crossed t's in the README file, for release. Vincent Driessen 2010-02-24 01:22:48 +01:00
• 05e658683a Removed the --squash option until it's fully implemented. Vincent Driessen 2010-02-22 21:09:30 +01:00
• e0d8af3bec Fix: endswith() implementation actually was a startswith() implementation. Vincent Driessen 2010-02-22 12:21:36 +01:00
• f9ebb076ba Added 'git flow init' to the README file. Vincent Driessen 2010-02-22 07:56:04 +01:00
• f10a48bbbd Merge branch 'feature/fix-gitflow-function-prefixes' into develop Vincent Driessen 2010-02-22 07:46:12 +01:00
• 6ee6223dc1 Fix: bug introduced in b25ab83334 Vincent Driessen 2010-02-22 07:45:24 +01:00
• 55c15539fa Reorder 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 +01:00
• 7832d6efb9 Better naming of common functions categorizing them into common, git specific and git-flow specific functions: Vincent Driessen 2010-02-21 21:31:03 +01:00
• 677334c60a Fix: 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 +01:00
• 6d74722d72 Merge branch 'feature/init-errors' into develop Vincent Driessen 2010-02-21 11:46:57 +01:00
• ef43cbd661 Check 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 +01:00
• c1598bf2cf Added 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 +01:00
• 1d8bb0d11a Add 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 +01:00
• 9ddb1dca68 Allow 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 +01:00
• f476d260b0 While we're user input in git flow init, ask the user for all prefix conventions, too. Vincent Driessen 2010-02-20 16:23:47 +01:00
• 3227d8027f Only switch to develop branch if it's newly created. Vincent Driessen 2010-02-20 16:13:23 +01:00
• 131c2988c6 Provided 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 +01:00
• b25ab83334 Added tests for asserting correctly configured git-flow environment/branches. Vincent Driessen 2010-02-20 11:21:23 +01:00
• 4e11dd6f21 Changed 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 +01:00
• cf6e92abc2 Changed 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 +01:00
• 61882067af Always 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 +01:00
• 0161de584c Added 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 +01:00
• 49094bd9c6 Change implementation of gitflow_all_branches() to get its result directly from git branch. Vincent Driessen 2010-02-18 12:05:01 +01:00
• d72e4aceed Rewrite 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 +01:00
• 21c7aa9c8b Don'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 +01:00
• b3e89fe50b Merge branch 'zerotao-patch' into develop Vincent Driessen 2010-02-19 06:43:21 +01:00
• ddba2df936 Fix spacing issues. Vincent Driessen 2010-02-19 06:42:18 +01:00
• 6809f0e478 Added push option (-p) to hotfix and release Jason L. Shiffer 2010-02-18 23:57:08 -05:00
• d44eaf90e8 Merge branch 'feature/compliance' into develop Vincent Driessen 2010-02-16 15:13:47 +01:00
• 6d64d2c340 Add check to disallow creation of a new release/hotfix branch when there still exists one. Vincent Driessen 2010-02-16 06:41:13 +01:00
• 283b0f708d Fixed 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 +01:00
• f46e2903cf Replaced all 'typeset' and 'typeset -i' calls by 'local', as adviced on: Vincent Driessen 2010-02-15 23:01:52 +01:00
• 13c94821e7 Added instructions to first fetch submodules before installing. Vincent Driessen 2010-02-15 20:09:02 +01:00
• 6ab98a52f4 Typo: by -> in Vincent Driessen 2010-02-11 00:05:36 +01:00
• 99c80527d7 Merge branch 'feature/quote-all-var-params' into develop Vincent Driessen 2010-02-10 00:45:31 +01:00
• b673c44595 Better (less complex) way of counting the branch name length. Vincent Driessen 2010-02-10 00:43:53 +01:00
• 6884523527 Use space (' ') instead of '?' as a pattern terminator. Vincent Driessen 2010-02-10 00:43:21 +01:00
• a4dd223d5b Quote all variables in function/program arguments. Vincent Driessen 2010-02-10 00:34:59 +01:00
• c5fcc01adb Do not quote variable assignments. Vincent Driessen 2010-02-10 00:18:08 +01:00
• fafa2b28be Merge branch 'feature/annotated-signed-tags' into develop Vincent Driessen 2010-02-09 00:55:38 +01:00
• d29e315f87 Annotated the code with some TODO-notes. Vincent Driessen 2010-02-09 00:55:06 +01:00
• 5fa4758e54 Made 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 +01:00
• 1a2868b8b4 Add tag annotation and tag signing to both release and hotfix. Vincent Driessen 2010-02-07 23:23:16 +01:00
• ca73caf8c5 Replaced all old-style flag variables by shFlags-style flag variables. Vincent Driessen 2010-02-07 19:46:38 +01:00
• d099126fe5 Tidying up: Vincent Driessen 2010-02-06 21:19:07 +01:00
• 886c9e1531 Merge branch 'feature/tidy-up' into develop Vincent Driessen 2010-02-06 15:00:03 +01:00
• 27592dd732 Tidy up: Vincent Driessen 2010-02-06 14:45:39 +01:00
• c3607ac2e8 Put all common functions into separate file gitflow-common. Vincent Driessen 2010-02-05 19:53:45 +01:00
• 5474e46a73 If 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 +01:00
• 010252a8a9 Added an optional <base> argument to all start subactions. Vincent Driessen 2010-02-04 10:31:29 +01:00
• 9277024410 Fix: error message for "Unknown subcommand" Vincent Driessen 2010-02-04 11:49:47 +01:00
• 3c337fb5e4 Added -v (--verbose) flags to list subaction of all subcommands. Vincent Driessen 2010-02-04 11:30:18 +01:00
• c7ea9b2236 Fix: add init to Makefile. Vincent Driessen 2010-02-04 10:22:13 +01:00
• 5455a6f9b1 Allow creation of feature branches even for dirty working trees (using flag -f, --force). Vincent Driessen 2010-02-03 00:14:05 +01:00
• 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. Vincent Driessen 2010-02-02 23:53:21 +01:00
• 1db658f5de Merge branch 'feature/fix-installer' into develop Vincent Driessen 2010-02-02 22:51:35 +01:00
• c3b7db9d2a Added a nicer way of installing/uninstalling git-flow. Vincent Driessen 2010-02-02 22:50:13 +01:00
• eec73c6777 Only push to the origin repo if we wanted to fetch, too. Vincent Driessen 2010-02-02 16:14:16 +01:00
• c3948cf8bd use correct name of shFlags Stefan Naewe 2010-02-02 12:27:56 +01:00
• d33e5ea81f Merge branch 'feature/rebase-subcommand' into develop Vincent Driessen 2010-02-02 12:00:00 +01:00
• 95bf82c2ab Add support for the -r (--rebase) option, before doing the actual merge. Vincent Driessen 2010-02-02 11:58:37 +01:00
• 9cf5673475 Fix: do integer comparison, not string comparison. wc returns stuff like ' 13', which is perfectly equal to 13. Vincent Driessen 2010-02-02 11:57:51 +01:00
• c62633fbe4 Added initial implementation of the rebase [-i] subcommand. Vincent Driessen 2010-02-02 10:48:50 +01:00
• 4c92a9d339 Add 'fatal' prefix for messages, like Git does itself. Vincent Driessen 2010-02-02 09:42:51 +01:00
• e168487d5c Fix: quote arg to typeset Vincent Driessen 2010-02-02 06:33:53 +01:00