Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added a simple command to be able to merge develop directly into master.
For our use case, the release branch is an overkill, and all testing, continuous integration and data qa can be run in the develop branch. If / when we get a dedicated QA team who will QA and push to production separately, then it makes sense to not have this. Squashed commit of the following: commit 2be136c Author: Varun Vijayaraghavan <[email protected]> Date: Wed Aug 21 14:50:27 2013 -0400 added the shFlags commit eb01738 Author: Varun Vijayaraghavan <[email protected]> Date: Wed Aug 21 14:49:32 2013 -0400 Added git-flow-develop commit 15aab26 Author: Jerome Baum <[email protected]> Date: Tue Sep 25 15:46:52 2012 +0200 Use git_do where appropriate commit 5bca8d9 Author: Jerome Baum <[email protected]> Date: Tue Sep 25 15:46:44 2012 +0200 Create a git_do command to log git actions commit 53e9c76 Merge: aa93d23 b72a395 Author: Vincent Driessen <[email protected]> Date: Tue Jul 10 02:18:02 2012 -0700 Merge pull request nvie#235 from oddnoc/feature/112-init-fix Prevent error message on git flow init. commit b72a395 Author: Fred Condo <[email protected]> Date: Mon Jul 9 18:37:12 2012 -0700 Prevent error message on git flow init As explained by Peter van der Does, the init command does not have the init function, nor does it need one. commit aa93d23 Merge: afb191f aec4818 Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 15:02:33 2012 +0200 Be git-describe friendly. This patch tags commits on the original (release/hotfix branch) instead of tagging the merge commit on the master branch. This keeps the history git-describe friendly. (For related discussions, see nvie#49, nvie#85, commit aec4818 Merge: a2f53f9 51011ac Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 05:52:48 2012 -0700 Merge pull request nvie#201 from sjaeckel/feature/msysInstall make the installer for msysgit search in ~/bin as well commit a2f53f9 Merge: 76ec133 805d245 Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 14:38:05 2012 +0200 Merge branch 'develop' into track-for-hotfix commit 76ec133 Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 14:38:01 2012 +0200 Revert changes installer location. commit c7e50ee Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 14:37:29 2012 +0200 Revert unnecessary changes. commit 805d245 Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 14:31:17 2012 +0200 Credit where credit is due. commit fda5507 Merge: 0c4d0bf f414f0c Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 14:24:06 2012 +0200 Merge branch 'develop' into squash-option commit 0c4d0bf Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 14:23:59 2012 +0200 Cleanup (mostly whitespace issues). commit f414f0c Merge: c072ff6 dc902ed Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 05:16:25 2012 -0700 Merge pull request nvie#211 from pcragone/develop Added 'init()' function to git-flow-{feature,release,hotfix,support} commit c072ff6 Merge: b1cc495 a223c3a Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 05:06:22 2012 -0700 Merge pull request nvie#219 from kperi/develop small bug fix in gif-flow-feature commit b1cc495 Merge: 392ed79 12c2a9c Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 05:04:41 2012 -0700 Merge pull request nvie#220 from memleak/patch-1 fixes pull existing feature from remote. commit 392ed79 Merge: 662bcd6 9c48e05 Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 05:00:22 2012 -0700 Merge pull request nvie#227 from jasom/develop Fix broken link to original blog-post commit 662bcd6 Merge: c26286e 2e9ab49 Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 04:58:40 2012 -0700 Merge pull request nvie#223 from sinbad/feature/tagmessagefromfile Support reading the tag message from a file in release/hotfix finish commit c26286e Merge: ab7fda2 2632778 Author: Vincent Driessen <[email protected]> Date: Mon Jul 9 04:58:20 2012 -0700 Merge pull request nvie#222 from sinbad/feature/fix_default_behaviour Fix init -d behaviour when master branch exists, and 1+ other branches exist, but develop does not commit 9c48e05 Author: Jason Miller <[email protected]> Date: Tue Jul 3 13:25:52 2012 -0700 Fix broken link to original blog-post commit 2e9ab49 Author: Steve Streeting <[email protected]> Date: Fri Jun 8 17:38:34 2012 -0700 Support reading the tag message from a file in release/hotfix finish This option ('-f' because '-F' was already taken) maps to the 'tag -F' option, and avoids the problem with issue nvie#98 (nvie#98) on Mac commit 2632778 Author: Steve Streeting <[email protected]> Date: Tue Jun 5 16:26:10 2012 -0700 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 commit 12c2a9c Author: memleak <[email protected]> Date: Fri Jun 1 13:45:31 2012 +0300 fixes pull existing feature from remote. commit a223c3a Author: Kostas <[email protected]> Date: Thu May 31 12:28:37 2012 +0100 fixed small bug in line 510, 'it' instead of 'git' commit ad511b6 Merge: 37f7d14 6606678 Author: Vedang Manerikar <[email protected]> Date: Tue May 1 16:19:15 2012 +0530 Merge branch 'develop' into feature/hotfix-tracking commit 6606678 Merge: 3b86dd3 ab7fda2 Author: Vedang Manerikar <[email protected]> Date: Tue May 1 16:18:44 2012 +0530 Updated from upstream commit dc902ed Author: pccr <[email protected]> Date: Sat Apr 21 00:23:55 2012 -0400 Added 'init()' function to git-flow-{feature,release,hotfix,support}, which gets called if subargument is not help commit 75fbdd7 Author: Myke Hines <[email protected]> Date: Thu Apr 19 11:14:22 2012 -0700 Feature finish squash parameter Adding an optional (false by default) -S option to 'git flow feature finish' to allow squashing the commit commit 6fa8fed Author: Myke Hines <[email protected]> Date: Thu Apr 19 11:01:23 2012 -0700 Release finish squash parameter Adding an optional (false by default) -S option to 'git flow release finish' to allow squashing the commit commit afb191f Author: Jason Schmidt <[email protected]> Date: Mon Apr 9 11:19:20 2012 -0400 Fixes nvie#206 commit 51011ac Author: Steffen Jaeckel <[email protected]> Date: Wed Mar 14 11:59:55 2012 +0200 make the installer for msysgit search in ~/bin as well commit 37f7d14 Author: Vedang Manerikar <[email protected]> Date: Mon Mar 12 17:03:11 2012 +0530 Added a track command to git-flow-hotfix along the lines of the git-flow-feature track command commit ab7fda2 Merge: cc5e9a5 1b454cc Author: Vincent Driessen <[email protected]> Date: Tue Feb 14 14:10:31 2012 +0100 Merge branch 'debian-installer' into develop Conflicts: README.mdown commit cc5e9a5 Author: Vincent Driessen <[email protected]> Date: Mon Feb 13 21:20:22 2012 +0100 Update the Changelog. commit f608281 Author: Ben Loveridge <[email protected]> Date: Fri Jan 6 11:04:46 2012 -0700 set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly Signed-off-by: Vincent Driessen <[email protected]> commit 679f05f Author: Vincent Driessen <[email protected]> Date: Mon Feb 13 20:53:21 2012 +0100 Remove the "still maintained" banner. This is done in anticipation of their discontinuing service. commit 53cfc35 Author: Vincent Driessen <[email protected]> Date: Mon Feb 13 20:48:14 2012 +0100 Add Vedang to AUTHORS. commit 7384052 Author: Vincent Driessen <[email protected]> Date: Mon Feb 13 20:43:12 2012 +0100 Fix indenting. commit 56bff9a Author: Vedang Manerikar <[email protected]> Date: Mon Jan 30 18:38:46 2012 +0530 Added a -r flag to git-flow-feature-pull to support pull with rebase Signed-off-by: Vincent Driessen <[email protected]> commit adfd408 Merge: bb1becd f66eba8 Author: Vincent Driessen <[email protected]> Date: Mon Feb 13 11:33:54 2012 -0800 Merge pull request nvie#160 from Zoramite/feature/Issue50 Adding the `eval` to force variable expansion. commit bb1becd Merge: ee27210 905cfb1 Author: Vincent Driessen <[email protected]> Date: Mon Feb 13 11:23:46 2012 -0800 Merge pull request nvie#178 from lorin/feature/docs Documented init -d flag and feature publish/pull commit ee27210 Merge: 07dacd5 afbf92c Author: Vincent Driessen <[email protected]> Date: Sun Feb 12 23:47:02 2012 -0800 Merge pull request nvie#195 from Zoramite/feature/Issue148 Updating the escape characters to fix + in the branch name commit f66eba8 Merge: d0df88d 07dacd5 Author: Randy Merrill <[email protected]> Date: Wed Feb 8 09:44:48 2012 -0800 Merge branch 'develop' into feature/Issue50 commit afbf92c Author: Randy Merrill <[email protected]> Date: Wed Feb 8 09:33:04 2012 -0800 Updating the escape characters to fix an issue with having a + in the branch name. Since git allows for it the escape should not escape it since it then won't match the branch names correctly. commit 3b86dd3 Author: Vedang Manerikar <[email protected]> Date: Mon Jan 30 19:26:38 2012 +0530 install from my github repo commit 6158d51 Author: Vedang Manerikar <[email protected]> Date: Mon Jan 30 18:38:46 2012 +0530 Added a -r flag to git-flow-feature-pull to support pull with rebase commit 905cfb1 Author: Lorin Hochstein <[email protected]> Date: Tue Dec 20 10:21:46 2011 -0500 whitespace commit 5a58633 Author: Lorin Hochstein <[email protected]> Date: Tue Dec 20 10:17:54 2011 -0500 Documented init -d flag and publish/pull Documented the -d flag for init command Added docs for feature push and feature pull commit 07dacd5 Author: Vincent Driessen <[email protected]> Date: Tue Dec 6 22:12:54 2011 +0100 Moved all installation instructions to the Wiki. There were becoming so large they were muddling the README. commit e8c88c0 Merge: 6107f88 c02c12d Author: Vincent Driessen <[email protected]> Date: Tue Dec 6 12:54:17 2011 -0800 Merge pull request nvie#173 from AlexZeitler/patch-1 Updated Cygwin section with possibly missing package. commit c02c12d Author: Alexander Zeitler <[email protected]> Date: Tue Dec 6 21:38:04 2011 +0100 Updated Cygwin section with possibly missing package. commit 6107f88 Merge: 72594ea e856e0a Author: Vincent Driessen <[email protected]> Date: Tue Dec 6 02:36:03 2011 -0800 Merge pull request nvie#172 from sjaeckel/develop fixed the installer in msysgit environment to work with windows XP commit e856e0a Author: Steffen Jaeckel <[email protected]> Date: Tue Dec 6 08:46:01 2011 +0100 fixed the installer in msysgit environment to work with windows XP as the command 'choice' is not available on Windows XP we have to work around this issue by usage of 'set /p' commit 72594ea Merge: b4626cb 083a588 Author: Vincent Driessen <[email protected]> Date: Thu Dec 1 15:40:04 2011 +0100 Merge branch 'feature/convert-slashes' into develop commit 083a588 Author: Vincent Driessen <[email protected]> Date: Thu Dec 1 08:56:59 2011 +0100 Better support for the Windows platform, where backslashes are dominant. commit 5e8cc9f Author: Vincent Driessen <[email protected]> Date: Thu Dec 1 08:52:33 2011 +0100 Oops, forgot about spaces in the dirname. Quite likely for Windows users to hit this problem. commit 4b9545e Author: Vincent Driessen <[email protected]> Date: Wed Nov 30 22:52:20 2011 +0100 Add a proposal for our Windows users. Will this help you guys out? commit b4626cb Merge: 49305ec 921ddf5 Author: Vincent Driessen <[email protected]> Date: Wed Nov 30 22:16:21 2011 +0100 Merge branch 'develop' of github.com:nvie/gitflow into develop commit 49305ec Author: Vincent Driessen <[email protected]> Date: Wed Nov 30 22:14:40 2011 +0100 Rewrote Eric's text a bit. commit 921ddf5 Author: Vincent Driessen <[email protected]> Date: Tue Nov 29 11:31:18 2011 +0100 Add Eric Holmes to list of contributors. commit ba0cc8a Author: Eric Holmes <[email protected]> Date: Tue Nov 29 00:23:15 2011 -0800 Add --recursive. commit 938ea5f Author: Eric Holmes <[email protected]> Date: Tue Nov 29 00:14:30 2011 -0800 Add information for contributing. commit baf163e Author: Eric J. Holmes <[email protected]> Date: Mon Nov 28 23:28:47 2011 -0800 Check if a remote master branch exists before die, track it if no local master branch exists commit 0d00b69 Author: Vincent Driessen <[email protected]> Date: Mon Nov 28 09:43:57 2011 +0100 Add Changelog note and added Emre to list of contributors. commit 62c339e Author: Emre Berge Ergenekon <[email protected]> Date: Sun Nov 27 22:07:57 2011 -0800 develop_branch uses origin/develop_branch as start-point if one exists. By default a local develop branch is created of from master regardless if a origin/develop exits. This problem is discussed in issues nvie#137 and nvie#23. commit 766159d Author: Vincent Driessen <[email protected]> Date: Thu Nov 24 13:02:00 2011 +0100 Add a cool new video tutorial on git-flow by Build a Module. commit 7cbdb84 Merge: 447808f 0b324de Author: Vincent Driessen <[email protected]> Date: Wed Nov 23 11:41:24 2011 -0800 Merge pull request nvie#163 from phoet/publish_hotfix add publishing to hotfix Thanks, pulled. commit 447808f Merge: be5dabf 4895c15 Author: Vincent Driessen <[email protected]> Date: Wed Nov 23 20:37:32 2011 +0100 Merge branch 'chad3814-develop' into develop Thanks, chad3814. commit 4895c15 Author: Vincent Driessen <[email protected]> Date: Wed Nov 23 20:36:16 2011 +0100 Fix wording. commit 0b324de Author: Peter Schröder <[email protected]> Date: Sat Nov 12 17:36:36 2011 +0100 add publishing to hotfix commit 9c5c806 Author: Chad Walker <[email protected]> Date: Tue Oct 25 15:42:32 2011 -0700 added a -D flag to the git flow finish command to try extra hard to delete the local branch after finishing the feature commit d0df88d Author: Randy Merrill <[email protected]> Date: Thu Oct 13 21:09:26 2011 -0700 Adding the variable expansion to the hotfix. commit 05c4dbc Author: Randy Merrill <[email protected]> Date: Thu Oct 13 20:28:10 2011 -0700 Adding the `eval` to force variable expansion. Closes nvie#50 commit 1b454cc Author: Gergely Nagy <[email protected]> Date: Thu Aug 25 09:24:55 2011 +0200 Replace contrib/debian/ with a note on how to install on Debian. Since gitflow is packaged for Debian and is available for testing and sid already, remove the contrib/ directory in favour of using the official Debian package. Also mention how to install gitflow on Debian in the README.mdown. Furthermore, Debian-specific things were removed from Changes.mdown and the Makefile. Signed-off-by: Gergely Nagy <[email protected]> commit be5dabf Merge: 7c7dc35 0c32062 Author: Vincent Driessen <[email protected]> Date: Wed Jul 27 00:56:17 2011 -0700 Merge pull request nvie#141 from moranjk/develop fixed malformed if statement Thanks, James. commit 0c32062 Author: James Moran <jmoran@jmoran-work.(none)> Date: Tue Jul 26 10:39:35 2011 -0400 fixed malformed if statement commit 7c7dc35 Merge: 3d12772 06e854a Author: Vincent Driessen <[email protected]> Date: Mon Jul 11 17:06:26 2011 +0200 Merge branch 'develop' of https://github.com/kixx/gitflow into develop commit 3d12772 Merge: 0191c68 e73a1d9 Author: Vincent Driessen <[email protected]> Date: Mon Jul 11 07:59:04 2011 -0700 Merge pull request nvie#138 from MarkBorcherding/feature/windows-install-step Adding windows install intruction for libintl3.dll commit e73a1d9 Author: Mark Borcherding <[email protected]> Date: Fri Jul 8 11:29:10 2011 -0500 Adding windows install step for libintl3.dll I found I also needed to install this file. It was mentioned in issue nvie#109. Adding this step to the instruction might help others avoid this same problem. commit 06e854a Author: Gruen Christian-Rolf (Kiki) <[email protected]> Date: Wed Jul 6 18:07:01 2011 +0300 Fix parsing for Bourne shell (FreeBSD) commit 0191c68 Merge: 14bcc58 26293bb Author: Vincent Driessen <[email protected]> Date: Mon Jun 13 22:21:57 2011 -0700 Merge pull request #132 from kwasticat/develop Install script depends on Bash-only features, needs slight adjustment! commit 26293bb Author: Tacit Sawk <[email protected]> Date: Tue Jun 14 10:51:43 2011 +1000 This script depends on Bash-only features, and so should not be executed with sh. commit 14bcc58 Author: Vincent Driessen <[email protected]> Date: Mon May 23 13:02:21 2011 +0200 Update the version number to distinguish HEAD from the released 0.4.1 version. commit 8b73fed Author: Vincent Driessen <[email protected]> Date: Mon May 16 11:09:18 2011 +0200 Update the changelog. commit 59e6aef Author: Vincent Driessen <[email protected]> Date: Mon May 16 11:04:42 2011 +0200 Update usage docs and changelog. commit cf5b2a5 Author: Vincent Driessen <[email protected]> Date: Mon May 16 10:37:16 2011 +0200 Implement git flow feature finish without a branch name to finish the current branch, if any. This fixes nvie#127. commit c4b4b3c Author: Vincent Driessen <[email protected]> Date: Mon May 16 10:44:13 2011 +0200 Make room for new minor release (and update the changelog). commit b7fc886 Author: Vincent Driessen <[email protected]> Date: Tue May 10 13:36:12 2011 +0200 Add Olivier Mengué to the list of contributors. Thanks for the MSysGit installer! commit 9720b66 Merge: 3626bfb b52f79e Author: Vincent Driessen <[email protected]> Date: Tue May 10 04:34:54 2011 -0700 Merge pull request nvie#109 from dolmen/feature/msysgit-install Installer for the Windows msysgit environment commit 3626bfb Author: Vincent Driessen <[email protected]> Date: Wed Apr 27 10:21:56 2011 +0200 Revert "Set GITFLOW_DIR correctly if git-flow is a symbolic link" This reverts commit fff16ed. commit f9ace1f Author: Vincent Driessen <[email protected]> Date: Tue Apr 26 14:59:09 2011 +0200 Add Jon Bernard to the list of contributors. commit a64939d Merge: d762995 fff16ed Author: Vincent Driessen <[email protected]> Date: Tue Apr 26 05:57:34 2011 -0700 Merged pull request nvie#119 from jbernard/develop. Set GITFLOW_DIR correctly if git-flow is a symbolic link commit d762995 Author: Vincent Driessen <[email protected]> Date: Tue Apr 26 14:14:30 2011 +0200 Add Kiall Mac Innes to the list of contributors. Thanks Kiall for the Debian package files! commit 7e583b5 Author: Vincent Driessen <[email protected]> Date: Tue Apr 26 14:13:45 2011 +0200 Moved the debian stuff to the contrib directory. commit 96e3e3f Merge: a7a89cd 6fc1323 Author: Vincent Driessen <[email protected]> Date: Tue Apr 26 05:12:46 2011 -0700 Merged pull request nvie#120 from kiall/develop. Add debian/ubuntu packaging commit 6fc1323 Author: Kiall Mac Innes <[email protected]> Date: Tue Apr 26 00:32:22 2011 +0100 Fixing some minor mistakes in debian/control metadata - followup to ca475ab commit ca475ab Author: Kiall Mac Innes <[email protected]> Date: Tue Apr 26 00:15:01 2011 +0100 Add debian/ubuntu packaging. commit fff16ed Author: Jon Bernard <[email protected]> Date: Sat Apr 23 13:09:57 2011 -0400 Set GITFLOW_DIR correctly if git-flow is a symbolic link This allows a user to create a symbolic link to git-flow in their personal bin directory (e.g. ~/bin) without having to add the source tree to their $PATH or do a system install. commit a7a89cd Author: Vincent Driessen <[email protected]> Date: Sun Apr 17 08:41:36 2011 +0200 Fix always-empty value for $DOT_GIT_DIR variable. This fixes nvie#53. commit e024fa4 Author: Vincent Driessen <[email protected]> Date: Sun Apr 17 08:33:36 2011 +0200 Add Jannis Leidel to the list of contributors. commit 499b468 Merge: 2f05c3c 8f280e0 Author: Vincent Driessen <[email protected]> Date: Sun Apr 17 08:32:37 2011 +0200 Merge branch 'develop' of https://github.com/jezdez/gitflow into develop commit 2f05c3c Author: Vincent Driessen <[email protected]> Date: Sun Apr 17 08:13:10 2011 +0200 Add Konstantin Tjuterev to the list of contributors. commit f1b3213 Merge: 2074360 f6fcc4e Author: Vincent Driessen <[email protected]> Date: Sun Apr 17 08:12:51 2011 +0200 Merge branch 'develop' of https://github.com/kostiklv/gitflow into develop commit 2074360 Author: Stefan Näwe <[email protected]> Date: Fri Apr 15 01:42:35 2011 -0700 release: start subcommand takes an optional base as well Signed-off-by: Stefan Naewe <[email protected]> commit f6fcc4e Author: Konstantin Tjuterev <[email protected]> Date: Thu Apr 14 19:20:19 2011 +0300 - Removed quoting in has $SOME_BRANCH $(get_remote_branches), as the check was always false - Added fetching develop branch from origin when fetch flag is on in feature finish commit 8f280e0 Author: Jannis Leidel <[email protected]> Date: Mon Mar 28 18:48:39 2011 +0200 Fixed require_tag_absent to not break when the list of tags contains an ambiguous entry, e.g. looking for "1.0.1" in "0.1.0 0.1.1 0.1.2 1.0". commit b52f79e Author: Olivier Mengué <[email protected]> Date: Sun Mar 20 20:34:39 2011 +0100 Update README for msysgit to use the new installer commit 023ed69 Author: Olivier Mengué <[email protected]> Date: Sun Mar 20 20:22:51 2011 +0100 Add an installer for the msysgit environment This installer: - detects the Git installation path - checks prereqs (git, getopt.exe) - delete old gitflow install - install gitflow files "Access denied" errors are detected and the user is given advice in that case ( use full administrator rights). commit baf66be Merge: f78b660 4b5b932 Author: Vincent Driessen <[email protected]> Date: Mon Feb 14 07:47:48 2011 +0100 Merge branch 'release/0.4.1' into develop
- Loading branch information
