Commit graph

  • be7d416962 Fix: "*" conflicted with markdown syntax Vincent Driessen 2010-01-26 00:56:02 +0100
  • 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 +0100
  • 788227b4ff Merge branch 'make-feature-work' into develop Vincent Driessen 2010-01-26 00:40:59 +0100
  • 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 +0100
  • 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 +0100
  • 144bb5078f Unified notation for stderr file descriptor redirection. Vincent Driessen 2010-01-25 23:55:18 +0100
  • 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. Vincent Driessen 2010-01-25 23:52:26 +0100
  • 377949c132 Added a TODO list for jotting down notes for future versions. Vincent Driessen 2010-01-25 23:34:54 +0100
  • b26c32fc29 Remove test-sh-setup test file. Vincent Driessen 2010-01-25 22:41:42 +0100
  • ec2c895cef Add extra line to error message for clarification. Vincent Driessen 2010-01-25 22:40:13 +0100
  • ab4b80d5b3 Merge branch 'ensure-clean-env' into develop Vincent Driessen 2010-01-25 22:16:57 +0100
  • 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. Vincent Driessen 2010-01-25 22:16:08 +0100
  • 6c9e8049a9 Add function gitflow_require_branch_absent(), to test for the *absence* of a branch. Vincent Driessen 2010-01-25 21:59:10 +0100
  • a1bc8717e2 Implemented the gitflow_check_clean_working_tree() check for dirty directories. Vincent Driessen 2010-01-25 21:50:08 +0100
  • afee9fdfed Add function gitflow_require_branches_equal() to test whether local and remote branches have diverged. Vincent Driessen 2010-01-25 17:29:29 +0100
  • a0434cad2e Add warn() function and redefine die() in terms of warn. Vincent Driessen 2010-01-25 17:28:22 +0100
  • 4f1cc33044 Added functions for assuring branches are in place before doing the actual work. Vincent Driessen 2010-01-25 16:44:57 +0100
  • 7d0a4096f7 Merge branch 'tag-releases' into develop Daniel Truemper 2010-01-25 09:48:14 +0100
  • 3ba8b3d676 tag each release Daniel Truemper 2010-01-25 09:47:59 +0100
  • e17663f887 Merge branch 'cleanup' into develop Daniel Truemper 2010-01-24 12:14:36 +0100
  • e4736ce59f duplicate method removed Daniel Truemper 2010-01-24 12:14:13 +0100
  • 21c3483326 allow optional argument to the feature subcommand Daniel Truemper 2010-01-24 12:11:15 +0100
  • 093a147731 Added header comments to all files. Vincent Driessen 2010-01-21 01:36:44 +0100
  • f7f687ce52 Also add basic skeleton implementation for the gitflow-feature and gitflow-release subcommands. Vincent Driessen 2010-01-21 01:32:18 +0100
  • 61ade55fcb Add initial beginning to the gitflow subcommand infrastructure. Vincent Driessen 2010-01-21 01:28:08 +0100
  • 60e07ef561 Fix indenting of Markdown text Vincent Driessen 2010-01-21 00:54:06 +0100
  • e8766e0e09 Quick test Vincent Driessen 2010-01-21 00:52:26 +0100
  • c0eea1e19e Rename README file to enable Github's markdown syntax. Vincent Driessen 2010-01-21 00:49:13 +0100
  • 78c73dc3ab Add initial project outline and guidelines. Vincent Driessen 2010-01-21 00:48:44 +0100
  • a9575ca331 first commit Vincent Driessen 2010-01-21 00:14:40 +0100