Commit Graph

  • d2eee63886 Clean up README by removing outdated sections develop Vincent Driessen 2025-10-14 11:12:50 +02:00
  • 550a5e3f5c Announce git-flow-next Vincent Driessen 2025-10-14 10:54:29 +02:00
  • 15aab26490 Use git_do where appropriate Jerome Baum 2012-09-25 15:46:52 +02:00
  • 5bca8d9358 Create a git_do command to log git actions Jerome Baum 2012-09-25 15:46:44 +02:00
  • 53e9c7680a Merge pull request #235 from oddnoc/feature/112-init-fix Vincent Driessen 2012-07-10 02:18:02 -07:00
  • b72a395ba6 Prevent error message on git flow init Fred Condo 2012-07-09 18:37:12 -07:00
  • aa93d2346f Be git-describe friendly. Vincent Driessen 2012-07-09 15:02:33 +02:00
  • aec48189a7 Merge pull request #201 from sjaeckel/feature/msysInstall Vincent Driessen 2012-07-09 05:52:48 -07:00
  • a2f53f9499 Merge branch 'develop' into track-for-hotfix Vincent Driessen 2012-07-09 14:38:05 +02:00
  • 76ec133f9d Revert changes installer location. Vincent Driessen 2012-07-09 14:38:01 +02:00
  • c7e50eed6e Revert unnecessary changes. Vincent Driessen 2012-07-09 14:37:29 +02:00
  • 805d2454ee Credit where credit is due. Vincent Driessen 2012-07-09 14:31:17 +02:00
  • fda5507f7b Merge branch 'develop' into squash-option Vincent Driessen 2012-07-09 14:24:06 +02:00
  • 0c4d0bf0f0 Cleanup (mostly whitespace issues). Vincent Driessen 2012-07-09 14:23:59 +02:00
  • f414f0cab6 Merge pull request #211 from pcragone/develop Vincent Driessen 2012-07-09 05:16:25 -07:00
  • c072ff61dc Merge pull request #219 from kperi/develop Vincent Driessen 2012-07-09 05:06:22 -07:00
  • b1cc495ab8 Merge pull request #220 from memleak/patch-1 Vincent Driessen 2012-07-09 05:04:41 -07:00
  • 392ed795e4 Merge pull request #227 from jasom/develop Vincent Driessen 2012-07-09 05:00:22 -07:00
  • 662bcd6ce8 Merge pull request #223 from sinbad/feature/tagmessagefromfile Vincent Driessen 2012-07-09 04:58:40 -07:00
  • c26286e365 Merge pull request #222 from sinbad/feature/fix_default_behaviour Vincent Driessen 2012-07-09 04:58:20 -07:00
  • 9c48e0569a Fix broken link to original blog-post Jason Miller 2012-07-03 13:25:52 -07:00
  • 2e9ab49e75 Support reading the tag message from a file in release/hotfix finish Steve Streeting 2012-06-08 17:38:34 -07:00
  • 26327787c7 Fix init -d behaviour when master branch exists, and one or more other branch exists, but develop does not Without this change, init picks 'master' as both the production and integration branch and fails. With it, init detects the clash and behaves the same as if only master exists, picking 'develop' as integration branch Steve Streeting 2012-06-05 16:26:10 -07:00
  • 12c2a9c307 fixes pull existing feature from remote. memleak 2012-06-01 13:45:31 +03:00
  • a223c3a633 fixed small bug in line 510, 'it' instead of 'git' Kostas 2012-05-31 12:28:37 +01:00
  • ad511b68a3 Merge branch 'develop' into feature/hotfix-tracking Vedang Manerikar 2012-05-01 16:19:15 +05:30
  • 6606678a2c Updated from upstream Vedang Manerikar 2012-05-01 16:18:44 +05:30
  • dc902eda3e Added 'init()' function to git-flow-{feature,release,hotfix,support}, which gets called if subargument is not help pccr 2012-04-21 00:23:55 -04:00
  • 75fbdd7bf7 Feature finish squash parameter Adding an optional (false by default) -S option to 'git flow feature finish' to allow squashing the commit Myke Hines 2012-04-19 11:14:22 -07:00
  • 6fa8fed23e Release finish squash parameter Adding an optional (false by default) -S option to 'git flow release finish' to allow squashing the commit Myke Hines 2012-04-19 11:01:23 -07:00
  • afb191f790 Fixes #206 Jason Schmidt 2012-04-09 11:19:20 -04:00
  • 51011ac8fd make the installer for msysgit search in ~/bin as well Steffen Jaeckel 2012-03-14 11:59:55 +02:00
  • 37f7d14b2f Added a track command to git-flow-hotfix along the lines of the git-flow-feature track command Vedang Manerikar 2012-03-12 17:03:11 +05:30
  • ab7fda21f1 Merge branch 'debian-installer' into develop Vincent Driessen 2012-02-14 14:10:31 +01:00
  • cc5e9a58bc Update the Changelog. Vincent Driessen 2012-02-13 21:20:22 +01:00
  • f608281885 set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly Ben Loveridge 2012-01-06 11:04:46 -07:00
  • 679f05f4fb Remove the "still maintained" banner. Vincent Driessen 2012-02-13 20:53:21 +01:00
  • 53cfc35147 Add Vedang to AUTHORS. Vincent Driessen 2012-02-13 20:48:14 +01:00
  • 7384052ee6 Fix indenting. Vincent Driessen 2012-02-13 20:43:12 +01:00
  • 56bff9a830 Added a -r flag to git-flow-feature-pull to support pull with rebase Vedang Manerikar 2012-01-30 18:38:46 +05:30
  • adfd408c6d Merge pull request #160 from Zoramite/feature/Issue50 Vincent Driessen 2012-02-13 11:33:54 -08:00
  • bb1becd661 Merge pull request #178 from lorin/feature/docs Vincent Driessen 2012-02-13 11:23:46 -08:00
  • ee272106a0 Merge pull request #195 from Zoramite/feature/Issue148 Vincent Driessen 2012-02-12 23:47:02 -08:00
  • f66eba89d0 Merge branch 'develop' into feature/Issue50 Randy Merrill 2012-02-08 09:44:48 -08:00
  • afbf92c620 Updating the escape characters to fix an issue with having a + in the branch name. Randy Merrill 2012-02-08 09:33:04 -08:00
  • 3b86dd34ca install from my github repo Vedang Manerikar 2012-01-30 19:26:38 +05:30
  • 6158d5163f Added a -r flag to git-flow-feature-pull to support pull with rebase Vedang Manerikar 2012-01-30 18:38:46 +05:30
  • 9283eaef81 Add some example hook scripts. feature/implement-hooks Vincent Driessen 2012-01-02 10:46:33 +01:00
  • 359db20590 Call the hooks explicitly on a per-action basis, with positional arguments that are relevant for the action at hand. Vincent Driessen 2012-01-02 09:22:43 +01:00
  • 203a793fba Refactor the code a bit. Vincent Driessen 2012-01-02 08:44:31 +01:00
  • 31e637d8c6 Revert all whitespace changes. Vincent Driessen 2012-01-02 08:26:46 +01:00
  • e93a50b42d Makes the feature more compliant with nvie comments in #171 Peter van der Does 2012-01-01 22:24:50 -05:00
  • 7c03411a49 Remove trailing whitespace Peter van der Does 2011-12-23 22:41:17 -05:00
  • c2fe6c7035 Add some documentation to the do_hook function Peter van der Does 2011-12-23 22:36:01 -05:00
  • 56ec32c149 Add the pre and post hook calls. Peter van der Does 2011-12-23 22:34:08 -05:00
  • 178cecb1f6 Implements do_hook function Peter van der Does 2011-12-23 21:04:58 -05:00
  • e4e0e0c9cc Rename the Hooks directory variable. Peter van der Does 2011-12-23 20:14:43 -05:00
  • cbe180f5c9 Add directory setup to the git flow init process Peter van der Does 2011-12-23 20:06:48 -05:00
  • 905cfb1e38 whitespace Lorin Hochstein 2011-12-20 10:21:46 -05:00
  • 5a58633615 Documented init -d flag and publish/pull Lorin Hochstein 2011-12-20 10:17:54 -05:00
  • 07dacd5212 Moved all installation instructions to the Wiki. Vincent Driessen 2011-12-06 22:12:54 +01:00
  • e8c88c0561 Merge pull request #173 from AlexZeitler/patch-1 Vincent Driessen 2011-12-06 12:54:17 -08:00
  • c02c12dd76 Updated Cygwin section with possibly missing package. Alexander Zeitler 2011-12-06 21:38:04 +01:00
  • 6107f88833 Merge pull request #172 from sjaeckel/develop Vincent Driessen 2011-12-06 02:36:03 -08:00
  • e856e0a528 fixed the installer in msysgit environment to work with windows XP Steffen Jaeckel 2011-12-06 08:46:01 +01:00
  • 72594ea4db Merge branch 'feature/convert-slashes' into develop Vincent Driessen 2011-12-01 15:40:04 +01:00
  • 083a588d4f Better support for the Windows platform, where backslashes are dominant. Vincent Driessen 2011-12-01 08:56:59 +01:00
  • 5e8cc9fceb Oops, forgot about spaces in the dirname. Vincent Driessen 2011-12-01 08:52:33 +01:00
  • 4b9545e582 Add a proposal for our Windows users. Vincent Driessen 2011-11-30 22:52:20 +01:00
  • b4626cb1b5 Merge branch 'develop' of github.com:nvie/gitflow into develop Vincent Driessen 2011-11-30 22:16:21 +01:00
  • 49305ec93d Rewrote Eric's text a bit. Vincent Driessen 2011-11-30 22:14:40 +01:00
  • 921ddf56e2 Add Eric Holmes to list of contributors. Vincent Driessen 2011-11-29 11:31:18 +01:00
  • ba0cc8a70f Add --recursive. Eric Holmes 2011-11-29 00:23:15 -08:00
  • 938ea5f074 Add information for contributing. Eric Holmes 2011-11-29 00:14:30 -08:00
  • baf163e07d Check if a remote master branch exists before die, track it if no local master branch exists Eric J. Holmes 2011-11-28 23:28:47 -08:00
  • 0d00b698f2 Add Changelog note and added Emre to list of contributors. Vincent Driessen 2011-11-28 09:43:57 +01:00
  • 62c339eba9 develop_branch uses origin/develop_branch as start-point if one exists. Emre Berge Ergenekon 2011-11-27 22:07:57 -08:00
  • 766159d303 Add a cool new video tutorial on git-flow by Build a Module. Vincent Driessen 2011-11-24 13:02:00 +01:00
  • 7cbdb84c01 Merge pull request #163 from phoet/publish_hotfix Vincent Driessen 2011-11-23 11:41:24 -08:00
  • 447808fa70 Merge branch 'chad3814-develop' into develop Vincent Driessen 2011-11-23 20:37:32 +01:00
  • 4895c15e44 Fix wording. Vincent Driessen 2011-11-23 20:36:16 +01:00
  • 0b324def48 add publishing to hotfix Peter Schröder 2011-11-12 17:36:36 +01:00
  • 9c5c806cf9 added a -D flag to the git flow finish command to try extra hard to delete the local branch after finishing the feature Chad Walker 2011-10-25 15:42:32 -07:00
  • d0df88da69 Adding the variable expansion to the hotfix. Randy Merrill 2011-10-13 21:09:26 -07:00
  • 05c4dbc8a8 Adding the eval to force variable expansion. Randy Merrill 2011-10-13 20:28:10 -07:00
  • 1b454cc0cf Replace contrib/debian/ with a note on how to install on Debian. Gergely Nagy 2011-08-25 09:24:55 +02:00
  • be5dabf88e Merge pull request #141 from moranjk/develop Vincent Driessen 2011-07-27 00:56:17 -07:00
  • 0c3206201a fixed malformed if statement James Moran 2011-07-26 10:39:35 -04:00
  • 7c7dc35c05 Merge branch 'develop' of https://github.com/kixx/gitflow into develop Vincent Driessen 2011-07-11 17:06:26 +02:00
  • 3d127721a0 Merge pull request #138 from MarkBorcherding/feature/windows-install-step Vincent Driessen 2011-07-11 07:59:04 -07:00
  • e73a1d95d1 Adding windows install step for libintl3.dll Mark Borcherding 2011-07-08 11:29:10 -05:00
  • 06e854ab12 Fix parsing for Bourne shell (FreeBSD) Gruen Christian-Rolf (Kiki) 2011-07-06 18:07:01 +03:00
  • 0191c68d13 Merge pull request #132 from kwasticat/develop Vincent Driessen 2011-06-13 22:21:57 -07:00
  • 26293bb3a9 This script depends on Bash-only features, and so should not be executed with sh. Tacit Sawk 2011-06-14 10:51:43 +10:00
  • 14bcc58e68 Update the version number to distinguish HEAD from the released 0.4.1 version. Vincent Driessen 2011-05-23 13:02:21 +02:00
  • 8b73fed62f Update the changelog. Vincent Driessen 2011-05-16 11:09:18 +02:00
  • 59e6aefa10 Update usage docs and changelog. Vincent Driessen 2011-05-16 11:04:42 +02:00
  • cf5b2a5562 Implement git flow feature finish without a branch name to finish the current branch, if any. Vincent Driessen 2011-05-16 10:37:16 +02:00
  • c4b4b3c286 Make room for new minor release (and update the changelog). Vincent Driessen 2011-05-16 10:44:13 +02:00
  • b7fc8868f9 Add Olivier Mengué to the list of contributors. Vincent Driessen 2011-05-10 13:36:12 +02:00