Git-flow - Revision history

Rasimsen at 23:01, 12 April 2020

2020-04-12T23:01:17Z

Rasimsen at 22:35, 12 April 2020

2020-04-12T22:35:05Z

Rasimsen at 22:27, 12 April 2020

2020-04-12T22:27:50Z

Rasimsen at 20:43, 12 April 2020

2020-04-12T20:43:56Z

Rasimsen at 20:19, 12 April 2020

2020-04-12T20:19:15Z

Rasimsen at 19:46, 12 April 2020

2020-04-12T19:46:48Z

Rasimsen at 18:52, 12 April 2020

2020-04-12T18:52:51Z

Rasimsen at 18:43, 12 April 2020

2020-04-12T18:43:21Z

Rasimsen at 18:22, 12 April 2020

2020-04-12T18:22:17Z

Rasimsen at 18:09, 12 April 2020

2020-04-12T18:09:42Z

← Older revision		Revision as of 23:01, 12 April 2020
Line 385:		Line 385:

	https://danielkummer.github.io/git-flow-cheatsheet/img/git-flow-commands.png		https://danielkummer.github.io/git-flow-cheatsheet/img/git-flow-commands.png
		+
		+	to see the git repo for this example, please visit:
		+
		+	https://github.com/rasimsen/git-flow-helloworld

	that's all dudes..		that's all dudes..

@@ Line 107: / Line 107: @@
 This action creates a new feature branch based on 'develop' and switches to it
-as an example
+'''as an example:'''
 <source>
 $ git flow feature start my-first-gitflow
@@ Line 139: / Line 139: @@
-as an example for our hello-world repo
+'''as an example for our hello-world repo'''
 <source>
@@ Line 176: / Line 176: @@
 </source>
-as an example
+'''as an example:'''
 <source>
@@ Line 189: / Line 189: @@
 </source>
-as an example
+'''as an example:'''
 <source>
 $ git flow feature pull origin my-first-gitflow
@@ Line 200: / Line 200: @@
 </source>
-as an example
+'''as an example:'''
 <source>
 $ git flow feature track my-first-gitflow
@@ Line 219: / Line 219: @@
 You can optionally supply a [BASE] commit sha-1 hash to start the release from. The commit must be on the 'develop' branch.
-as an example
+'''as an example:'''
 <source>
 $ git flow release start relase-april2020
@@ Line 242: / Line 242: @@
 </source>
-as an example
+'''as an example:'''
 <source>
 $ git flow release publish relase-april2020
@@ Line 284: / Line 284: @@
 Don't forget to push your tags with <source>git push origin --tags</source>
-as an example
+'''as an example:'''
 <source>
 $ git flow release finish relase-april2020
@@ Line 325: / Line 324: @@
 The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.
-'''as an example'''
+'''as an example:'''
 <source>
 $ git flow hotfix start relase-april2020-bugfix
@@ Line 365: / Line 363: @@
 </source>
-'''as an example'''
+'''as an example:'''
 <source>
 $ git flow hotfix finish relase-april2020-bugfix

← Older revision		Revision as of 22:27, 12 April 2020
Line 310:		Line 310:
	- You are now on branch 'develop'		- You are now on branch 'develop'
	</source>		</source>
		+
		+	=Hotfixes=
		+
		+	* Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
		+	* May be branched off from the corresponding tag on the master branch that marks the production version.
		+
		+	==git flow hotfix start==
		+	Like the other git flow commands, a hotfix is started with
		+
		+	<source>
		+	$ git flow hotfix start VERSION [BASENAME]
		+	</source>
		+
		+	The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.
		+
		+	'''as an example'''
		+
		+	<source>
		+	$ git flow hotfix start relase-april2020-bugfix
		+
		+	Branches 'master' and 'origin/master' have diverged.
		+	And local branch 'master' is ahead of 'origin/master'.
		+	Switched to a new branch 'hotfix/relase-april2020-bugfix'
		+
		+	Summary of actions:
		+	- A new branch 'hotfix/relase-april2020-bugfix' was created, based on 'master'
		+	- You are now on branch 'hotfix/relase-april2020-bugfix'
		+
		+	Follow-up actions:
		+	- Start committing your hot fixes
		+	- Bump the version number now!
		+	- When done, run:
		+
		+	git flow hotfix finish 'relase-april2020-bugfix'
		+
		+	</source>
		+
		+	it creates brand new branch for bug fix from master branch
		+
		+	<source>
		+	$ git branch
		+	develop
		+	* hotfix/relase-april2020-bugfix
		+	master
		+	</source>
		+
		+	make some changes..
		+
		+	==Finish a hotfix==
		+	By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.
		+
		+	<source>
		+	$ git flow hotfix finish VERSION
		+	</source>
		+
		+	'''as an example'''
		+
		+	<source>
		+	$ git flow hotfix finish relase-april2020-bugfix
		+
		+	Branches 'master' and 'origin/master' have diverged.
		+	And local branch 'master' is ahead of 'origin/master'.
		+	Switched to branch 'develop'
		+	Merge made by the 'recursive' strategy.
		+	README.md \| 2 ++
		+	1 file changed, 2 insertions(+)
		+	Deleted branch hotfix/relase-april2020-bugfix (was 6c9f18a).
		+
		+	Summary of actions:
		+	- Hotfix branch 'hotfix/relase-april2020-bugfix' has been merged into 'master'
		+	- The hotfix was tagged 'relase-april2020-bugfix'
		+	- Hotfix tag 'relase-april2020-bugfix' has been back-merged into 'develop'
		+	- Hotfix branch 'hotfix/relase-april2020-bugfix' has been locally deleted
		+	- You are now on branch 'develop'
		+	</source>
		+
		+
		+	https://danielkummer.github.io/git-flow-cheatsheet/img/git-flow-commands.png
		+
		+	that's all dudes..

@@ Line 218: / Line 218: @@
 You can optionally supply a [BASE] commit sha-1 hash to start the release from. The commit must be on the 'develop' branch.
 It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:
@@ Line 223: / Line 240: @@
 <source>
 $ git flow release publish RELEASE
 </source>
@@ Line 241: / Line 283: @@
 Don't forget to push your tags with <source>git push origin --tags</source>

← Older revision		Revision as of 20:19, 12 April 2020
Line 164:		Line 164:
	- You are now on branch 'develop'		- You are now on branch 'develop'
	</source>		</source>
		+
		+	we merged our feature branch changes with develop branch, but our job is not finished yet.
		+
		+	===Publish a feature===
		+	Are you developing a feature in collaboration?
		+
		+	Publish a feature to the remote server so it can be used by other users.
		+
		+	<source>
		+	$ git flow feature publish MYFEATURE
		+	</source>
		+
		+	as an example
		+
		+	<source>
		+	$ git flow feature publish my-first-gitflow
		+	</source>
		+
		+	===Getting a published feature===
		+	Get a feature published by another user.
		+
		+	<source>
		+	$ git flow feature pull origin MYFEATURE
		+	</source>
		+
		+	as an example
		+	<source>
		+	$ git flow feature pull origin my-first-gitflow
		+	</source>
		+
		+	You can track a feature on origin by using
		+
		+	<source>
		+	$ git flow feature track MYFEATURE
		+	</source>
		+
		+	as an example
		+	<source>
		+	$ git flow feature track my-first-gitflow
		+	</source>
		+
		+	==Release==
		+	Support preparation of a new production release
		+
		+	Allow for minor bug fixes and preparing meta-data for a release
		+
		+	===Start a release===
		+	To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.
		+
		+	<source>
		+	$ git flow release start RELEASE [BASE]
		+	</source>
		+
		+	You can optionally supply a [BASE] commit sha-1 hash to start the release from. The commit must be on the 'develop' branch.
		+
		+	It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:
		+
		+	<source>
		+	$ git flow release publish RELEASE
		+	</source>
		+
		+	(You can track a remote release with the
		+	<source>git flow release track RELEASE</source> command)
		+
		+	===Finish up a release===
		+	Finishing a release is one of the big steps in git branching. It performs several actions:
		+
		+	* Merges the release branch back into 'master'
		+	* Tags the release with its name
		+	* Back-merges the release into 'develop'
		+	* Removes the release branch
		+
		+	<source>
		+	$ git flow release finish RELEASE
		+	</source>
		+
		+	Don't forget to push your tags with <source>git push origin --tags</source>

@@ Line 88: / Line 88: @@
 Version tag prefix? []
 Hooks and filters directory? [/workspace/git-flow-helloworld/.git/hooks]
 </source>

@@ Line 62: / Line 62: @@
 </source>
-'''Initialize git-flow'''
+==Initialize git-flow==
 Start using git-flow by initializing it inside an existing git repository:

@@ Line 48: / Line 48: @@
 Git flow needs to be initialized in order to customize your project setup.
-'''Initialize'''
+==Create new git repo==
 Start using git-flow by initializing it inside an existing git repository:

← Older revision		Revision as of 18:22, 12 April 2020
Line 20:		Line 20:

	Git flow works on macOS, Linux and Windows		Git flow works on macOS, Linux and Windows
		+
		+	==macOS==
		+	'''[[Homebrew]]'''
		+	<source>
		+	$ brew install git-flow-avh
		+	</source>
		+
		+	'''[[Macports]]'''
		+	<source>
		+	$ port install git-flow-avh
		+	</source>
		+
		+	==Linux==
		+	<source>
		+	$ apt-get install git-flow
		+	</source>
		+
		+
		+	==Windows (Cygwin)==
		+	<source>
		+	$ wget -q -O - --no-check-certificate https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable \| bash
		+	</source>
		+
		+	You need wget and util-linux to install git-flow.
		+
		+	=Hello World with git-flow=
		+	Git flow needs to be initialized in order to customize your project setup.
		+
		+	'''Initialize'''
		+	Start using git-flow by initializing it inside an existing git repository:

@@ Line 18: / Line 18: @@
 =Installation=
 You need a working git installation as prerequisite. [[git]]
 Git flow works on macOS, Linux and Windows