Gitiles
Code Review Sign In
source.supwisdom.com / common / gitflow / d33e5ea81fbb99ab5e46737224a4156690d4300d
  1. d33e5ea Merge branch 'feature/rebase-subcommand' into develop by Vincent Driessen · 15 years ago
  2. 95bf82c Add support for the -r (--rebase) option, before doing the actual merge. by Vincent Driessen · 15 years ago
  3. 9cf5673 Fix: do integer comparison, not string comparison. wc returns stuff like ' 13', which is perfectly equal to 13. by Vincent Driessen · 15 years ago
  4. c62633f Added initial implementation of the rebase [-i] subcommand. by Vincent Driessen · 15 years ago
  5. 4c92a9d Add 'fatal' prefix for messages, like Git does itself. by Vincent Driessen · 15 years ago
  6. e168487 Fix: quote arg to typeset by Vincent Driessen · 15 years ago
  7. aaec7b3 Merge branch 'feature/allow-diff-without-name-arg' into develop by Vincent Driessen · 15 years ago
  8. 11b1f41 Allow for optional <name> argument in feature diffs. (No name uses the "current" feature branch.) by Vincent Driessen · 15 years ago
  9. b03cf96 Update options for feature's subcommands in usage. by Vincent Driessen · 15 years ago
  10. 1156092 Fix: bug that caused BRANCH variable not to be set correctly. by Vincent Driessen · 15 years ago
  11. aa6d016 Implement showing the currently checked out feature branch in feature list by Vincent Driessen · 15 years ago
  12. e9d2d04 Add TODO item for adding installation of shFlags, too. by Vincent Driessen · 15 years ago
  13. 0a5c730 Merge branch 'feature/verbose-feature-list' into develop by Vincent Driessen · 15 years ago
  14. 1adbc3e Dynamically calculate maximal column width used in verbose feature list output. by Vincent Driessen · 15 years ago
  15. f2536f4 Add initial implementation of the --verbose flag algorithm. by Vincent Driessen · 15 years ago
  16. 60d3d62 Merge branch 'feature/getopt' into develop by Vincent Driessen · 15 years ago
  17. 1b81923 Use shFlags to parse flags given to main and subcommands. by Vincent Driessen · 15 years ago
  18. ea58d0f Added initial implementation of using shFlags. by Vincent Driessen · 15 years ago
  19. 42600d9 Include shFlags repo as a Git submodule. by Vincent Driessen · 15 years ago
  20. d3bc760 Merge branch 'feature/allow-prefixes-as-name-arg-on-finish' into develop by Vincent Driessen · 15 years ago
  21. 7ae320b Fix one old occurence of gitflow_check_ -> gitflow_require_ by Vincent Driessen · 15 years ago
  22. 1ee37e7 Fix one old occurence of gitflow_check_ -> gitflow_require_ by Vincent Driessen · 15 years ago
  23. ea60895 Document which subcommands may use the prefix. by Vincent Driessen · 15 years ago
  24. 8392ed3 Doesn't make sense to allow prefix names for commands that require $BRANCH to be absent. by Vincent Driessen · 15 years ago
  25. 22ef21a Further divide the parse_args function up, to support automatic prefix expansion for all subcommands, except for 'feature start' by Vincent Driessen · 15 years ago
  26. 2e1856b Implement the basic logic to resolve name prefixes passed to 'flow feature' into their full feature branch names, if unambiguous. by Vincent Driessen · 15 years ago
  27. a0fe939 Merge branch 'feature/merge-conflict-support' into develop by Vincent Driessen · 15 years ago
  28. f6f152f Support scenarios where the user might have cancelled a merge in the middle of a merge conflict. by Vincent Driessen · 15 years ago
  29. 62345d5 Created a second function called gitflow_test_clean_working_tree() that returns error codes instead of dies. by Vincent Driessen · 15 years ago
  30. 49c7d02 Initial implementation of merge conflict resolution support. by Vincent Driessen · 15 years ago
  31. 58995b5 Include a globally available variable GIT_DIR, that points to the .git directory. by Vincent Driessen · 15 years ago
  32. 17a8112 Merge branch 'feature/no-connectivity-for-feature-branches' into develop by Vincent Driessen · 15 years ago
  33. 2acfffd Make the 'to fetch or not to fetch' flag explicit in the other commands, too. by Vincent Driessen · 15 years ago
  34. 57e7bde Fix: respect the VERSION_PREFIX in hotfix releases, too. by Vincent Driessen · 15 years ago
  35. ab3dc49 Fix: respect the VERSION_PREFIX in hotfix releases, too. by Vincent Driessen · 15 years ago
  36. e034e4a Only have network connectivity when explicitly asked for feature branches. This action is so common that it should be quick (very git-ish). by Vincent Driessen · 15 years ago
  37. 4838644 Replace gitflow_check_ prefixes by gitflow_require_ prefixes, for consistency. by Vincent Driessen · 15 years ago
  38. 278884b Fix 'feature diff' by Vincent Driessen · 15 years ago
  39. 92b125c Remove pointless check for existence of function setup() by Vincent Driessen · 15 years ago
  40. 46e9c86 Merge branch 'feature/subcmd-structure' into develop by Vincent Driessen · 15 years ago
  41. 04839ae Forgot list command for hotfixes. by Vincent Driessen · 15 years ago
  42. 05caf02 Remove double entry from README. by Vincent Driessen · 15 years ago
  43. b866b01 Give all subcommands an optional setup() function that will be called by git-flow in order to let the subcommand initialize its environment. by Vincent Driessen · 15 years ago
  44. 49dd62b refactor git config calls to global variables by Benedikt Böhm · 15 years ago
  45. fb238a2 Remove double entry from README. by Vincent Driessen · 15 years ago
  46. 7672d99 remove useless sanity check by Benedikt Böhm · 15 years ago
  47. 0b378bc Merge branch 'feature/flip-args' into develop by Vincent Driessen · 15 years ago
  48. c81e7a2 Update the README to reflect the new subcommand structure. by Vincent Driessen · 15 years ago
  49. 3625f39 Make git-flow-version a first-class citizen amongst the other subcommands. by Vincent Driessen · 15 years ago
  50. 170dc74 Refactored the feature, release and support subcommands, too. by Vincent Driessen · 15 years ago
  51. 186d2b5 Refactored the subcommand invocation logic to form a more hierarchical structure and a cleaner design. by Vincent Driessen · 15 years ago
  52. 3911e16 Also, print the version tag in the summary message, then. by Vincent Driessen · 15 years ago
  53. 74a4fe2 restore &> behaviour but with posix compliant shell syntax by Benedikt Böhm · 15 years ago
  54. b22a076 make version tag prefix configurable so one can use it for github semver.org compliance by Benedikt Böhm · 15 years ago
  55. c51aedf No feature branches is perfectly OK, so exit clean with code 0. by Vincent Driessen · 15 years ago
  56. bd4f095 Added cmd_list and cmd_diff to git-flow-feature. by Vincent Driessen · 15 years ago
  57. 4e5c3e9 In the 'finish release' summary, also exclude the 'v' prefix. by Vincent Driessen · 15 years ago
  58. a1db9f1 Don't prefix tag names with 'v'. If you want that behaviour, include the 'v' on the command line manually. by Vincent Driessen · 15 years ago
  59. 1f2741a sh builtin command typeset is more portable than declare by Vincent Driessen · 15 years ago
  60. 2ba9a4d Fix: run git commands in the foreground, instead of the background. by Vincent Driessen · 15 years ago
  61. 67f781f Add 'uninstall' target, too. by Vincent Driessen · 15 years ago
  62. dd720be 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'. by Vincent Driessen · 15 years ago
  63. a7d4527 Don't assume git aliases. by Vincent Driessen · 15 years ago
  64. ca2b517 Omit 'v' prefix. by Vincent Driessen · 15 years ago
  65. 9096074 Make install arguments compatible with BSD install. by Vincent Driessen · 15 years ago
  66. 6b95f21 Remove TODO file, replaced it by the central issues list on http://github.com/nvie/gitflow/issues by Vincent Driessen · 15 years ago
  67. 6c2d30b Structurally replace gitflow by git-flow, as a true git extension. by Vincent Driessen · 15 years ago
  68. 12c4ab4 Update README file to mention new available features. by Vincent Driessen · 15 years ago
  69. bd4a1f1 Merge branch 'review' into develop by Vincent Driessen · 15 years ago
  70. c7bbfcf Deliberately add a Makefile target to prevent accidental installation of gitflow. by Vincent Driessen · 15 years ago
  71. f781242 Bumped the version number to 0.2 by Vincent Driessen · 15 years ago
  72. 059e689 Make bump-version write to the new location of git-flow-version by Vincent Driessen · 15 years ago
  73. 427c5db implement init command by Benedikt Böhm · 15 years ago
  74. a93a535 add simple make install target by Benedikt Böhm · 15 years ago
  75. 4d22227 make git fetch silent by Benedikt Böhm · 15 years ago
  76. e2fa491 remove bash specific expansions by Benedikt Böhm · 15 years ago
  77. 83d4361 fix modes by Benedikt Böhm · 15 years ago
  78. 7d703a8 Merge branch 'develop' of git://github.com/nvie/gitflow into develop by Benedikt Böhm · 15 years ago
  79. d2240e4 Merge branch 'feature/configurable-main-branches' into develop by Benedikt Böhm · 15 years ago
  80. 96f44c0 make branch prefixes configurable by Benedikt Böhm · 15 years ago
  81. 350e715 make origin configurable by Benedikt Böhm · 15 years ago
  82. 4a864fb make master and develop branch names configurable by Benedikt Böhm · 15 years ago
  83. 4aaec2f Fix markdown formatting issues. by Vincent Driessen · 15 years ago
  84. 4ea07a2 set -e conflicts with new sanity checks by Benedikt Böhm · 15 years ago
  85. 3e970a0 Merge branch 'release-0.1' into develop by Vincent Driessen · 15 years ago
  86. e5eaff9 add bash debug support by Benedikt Böhm · 15 years ago
  87. f206ba6 Update README file to match the 0.1 release status. by Vincent Driessen · 15 years ago
  88. 00ccea6 refactor the whole thing by Benedikt Böhm · 15 years ago
  89. caa5830 Auto-commit version number when bumped. by Vincent Driessen · 15 years ago
  90. a676509 Bumped version number to 0.1 by Vincent Driessen · 15 years ago
  91. 5cdfc2f Add shell script to automatically changes the version number. by Vincent Driessen · 15 years ago
  92. 463dd44 Add static shell variable that specifies the gitflow release version. by Vincent Driessen · 15 years ago
  93. 403fdca Fix: btype -> type by Vincent Driessen · 15 years ago
  94. 605b7cd Functionally implement the gitflow-hotfix subcommand. by Vincent Driessen · 15 years ago
  95. 696b9eb Functionally implement the creation/finishing of release branches. by Vincent Driessen · 15 years ago
  96. be7d416 Fix: "*" conflicted with markdown syntax by Vincent Driessen · 15 years ago
  97. 938b073 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). by Vincent Driessen · 15 years ago
  98. 788227b Merge branch 'make-feature-work' into develop by Vincent Driessen · 15 years ago
  99. 65cdbb7 Functionally implemented the gitflow-feature subcommand. Starting and finishing feature branches is now possible in your repos. by Vincent Driessen · 15 years ago
  100. 51fa95d Only mention (warn) when develop is ahead of origin/develop. This is not harmful in any way. by Vincent Driessen · 15 years ago