GitPhraseBook - Revision history

UlfSamuelsson: /* Example 3: Working with a private branch */

2011-11-22T20:42:32Z

Example 3: Working with a private branch

UlfSamuelsson: /* Example 3: Working with a private branch */

2011-11-21T14:59:50Z

Example 3: Working with a private branch

← Older revision		Revision as of 14:59, 21 November 2011
Line 271:		Line 271:
	=== Example 3: Working with a private branch ===		=== Example 3: Working with a private branch ===

	Download and create a remote private branch "origin/ulf/linux-2.6.30-2011-05-13".		Download and create a remote private branch "origin/ulf/linux-2.6.39-2011-11-21".
	The local copy of the branch will be called "ulf/linux-2.6.30-2011-05-13"-		The local copy of the branch will be called "ulf/linux-2.6.39-2011-11-21".
	When you do:		When you do:

UlfSamuelsson: /* Example 3: Working with a private branch */

2011-11-21T14:58:59Z

Example 3: Working with a private branch

UlfSamuelsson: /* Example 3: Working with a private branch */

2011-11-18T16:13:51Z

Example 3: Working with a private branch

← Older revision		Revision as of 16:13, 18 November 2011
Line 285:		Line 285:
	cd openembedded		cd openembedded
	git config user.name "Ulf Samuelsson"		git config user.name "Ulf Samuelsson"
	git config user.email "~~ulf.samuelsson~~@~~atmel~~.com"		git config user.email "ulf_samuelsson@telia.com"
	git checkout -b ulf/linux-2.6.30-2011-05-13 origin/org.openembedded.dev		git checkout -b ulf/linux-2.6.39-2011-11-18 origin/org.openembedded.dev

	Add something:		Add something:
Line 295:		Line 295:

	Create a remote private branch from the local branch.		Create a remote private branch from the local branch.
	It will be called "origin/ulf/linux-2.6.30-2011-05-13"		It will be called "origin/ulf/linux-2.6.39-2011-11-18"

	git push origin ulf/linux-2.6.30-2011-05-13		git push origin ulf/linux-2.6.39-2011-11-18

	Create a local branch, based on your remote private branch:		Create a local branch, based on your remote private branch:

	git checkout -b ulf/linux-2.6.30-2011-05-13 origin/ulf/linux-2.6.30-2011-05-13		git checkout -b ulf/linux-2.6.39-2011-11-18 origin/ulf/linux-2.6.39-2011-11-18

	Add something to your local branch:		Add something to your local branch:
Line 311:		Line 311:
	Update your remote private branch:		Update your remote private branch:

	git push origin ulf/linux-2.6.30-2011-05-13		git push origin ulf/linux-2.6.39-2011-11-18

	Once the remote branch has been updated from a local		Once the remote branch has been updated from a local
Line 325:		Line 325:

	git checkout origin/org.openembedded.dev		git checkout origin/org.openembedded.dev
	git branch -d ulf/~~linux~~-2.6.30-2011-05-13		git branch -d ulf/llinux-2.6.39-2011-11-18

	or possibly:		or possibly:

	git branch -D ulf/linux-2.6.30-2011-05-13		git branch -D ulf/linux-2.6.39-2011-11-18

	Note that the openembedded git server will not		Note that the openembedded git server will not

UlfSamuelsson: /* Pushing your changes */

2011-05-15T06:01:51Z

Pushing your changes

← Older revision		Revision as of 06:01, 15 May 2011
Line 119:		Line 119:
	== Pushing your changes ==		== Pushing your changes ==
	# just pushes the org.openembedded.dev		# just pushes the org.openembedded.dev
	git push origin ~~origin/~~org.openembedded.dev		git push origin org.openembedded.dev

	# the same, just simpler		# the same, just simpler

UlfSamuelsson: /* Pushing your changes */

2011-05-14T11:26:10Z

Pushing your changes

← Older revision		Revision as of 11:26, 14 May 2011
Line 119:		Line 119:
	== Pushing your changes ==		== Pushing your changes ==
	# just pushes the org.openembedded.dev		# just pushes the org.openembedded.dev
	git push origin org.openembedded.dev		git push origin origin/org.openembedded.dev

	# the same, just simpler		# the same, just simpler

UlfSamuelsson: /* Example 3: Working with a private branch */

2011-05-14T09:28:21Z

Example 3: Working with a private branch

← Older revision		Revision as of 09:28, 14 May 2011
Line 271:		Line 271:
	=== Example 3: Working with a private branch ===		=== Example 3: Working with a private branch ===

	Download and create a remote private branch "origin/ulf/linux-2.6.30-2011-01-16".		Download and create a remote private branch "origin/ulf/linux-2.6.30-2011-05-13".
	The local copy of the branch will be called "ulf/linux-2.6.30-2011-01-16"-		The local copy of the branch will be called "ulf/linux-2.6.30-2011-05-13"-
	When you do:		When you do:

Line 286:		Line 286:
	git config user.name "Ulf Samuelsson"		git config user.name "Ulf Samuelsson"
	git config user.email "ulf.samuelsson@atmel.com"		git config user.email "ulf.samuelsson@atmel.com"
	git checkout -b ulf/linux-2.6.30-2011-04-16 origin/org.openembedded.dev		git checkout -b ulf/linux-2.6.30-2011-05-13 origin/org.openembedded.dev

	Add something:		Add something:
Line 295:		Line 295:

	Create a remote private branch from the local branch.		Create a remote private branch from the local branch.
	It will be called "origin/ulf/linux-2.6.30-2011-04-16"		It will be called "origin/ulf/linux-2.6.30-2011-05-13"

	git push origin ulf/linux-2.6.30-2011-04-16		git push origin ulf/linux-2.6.30-2011-05-13

	Create a local branch, based on your remote private branch:		Create a local branch, based on your remote private branch:

	git checkout -b ulf/linux-2.6.30-2011-04-16 origin/ulf/linux-2.6.30-2011-04-16		git checkout -b ulf/linux-2.6.30-2011-05-13 origin/ulf/linux-2.6.30-2011-05-13

	Add something to your local branch:		Add something to your local branch:
Line 311:		Line 311:
	Update your remote private branch:		Update your remote private branch:

	git push origin ulf/linux-2.6.30-2011-04-16		git push origin ulf/linux-2.6.30-2011-05-13

	Once the remote branch has been updated from a local		Once the remote branch has been updated from a local
Line 325:		Line 325:

	git checkout origin/org.openembedded.dev		git checkout origin/org.openembedded.dev
	git branch -d ulf/linux-2.6.30-2011-04-16		git branch -d ulf/linux-2.6.30-2011-05-13

	or possibly:		or possibly:

	git branch -D ulf/linux-2.6.30-2011-04-16		git branch -D ulf/linux-2.6.30-2011-05-13

	Note that the openembedded git server will not		Note that the openembedded git server will not

UlfSamuelsson: /* Example 3: Working with a private branch */

2011-04-14T20:59:22Z

Example 3: Working with a private branch

← Older revision		Revision as of 20:59, 14 April 2011
Line 286:		Line 286:
	git config user.name "Ulf Samuelsson"		git config user.name "Ulf Samuelsson"
	git config user.email "ulf.samuelsson@atmel.com"		git config user.email "ulf.samuelsson@atmel.com"
	git checkout -b ulf/linux-2.6.30-2011-01-16 origin/org.openembedded.dev		git checkout -b ulf/linux-2.6.30-2011-04-16 origin/org.openembedded.dev

	Add something:		Add something:
Line 295:		Line 295:

	Create a remote private branch from the local branch.		Create a remote private branch from the local branch.
	It will be called "origin/ulf/linux-2.6.30-2011-01-16"		It will be called "origin/ulf/linux-2.6.30-2011-04-16"

	git push origin ulf/linux-2.6.30-2011-01-16		git push origin ulf/linux-2.6.30-2011-04-16

	Create a local branch, based on your remote private branch:		Create a local branch, based on your remote private branch:

	git checkout -b ulf/linux-2.6.30-2011-01-16 origin/ulf/linux-2.6.30-2011-01-16		git checkout -b ulf/linux-2.6.30-2011-04-16 origin/ulf/linux-2.6.30-2011-04-16

	Add something to your local branch:		Add something to your local branch:
Line 311:		Line 311:
	Update your remote private branch:		Update your remote private branch:

	git push origin ulf/linux-2.6.30-2011-01-16		git push origin ulf/linux-2.6.30-2011-04-16

	Once the remote branch has been updated from a local		Once the remote branch has been updated from a local
Line 325:		Line 325:

	git checkout origin/org.openembedded.dev		git checkout origin/org.openembedded.dev
	git branch -d ulf/linux-2.6.30-2011-01-16		git branch -d ulf/linux-2.6.30-2011-04-16

	or possibly:		or possibly:

	git branch -D ulf/linux-2.6.30-2011-01-16		git branch -D ulf/linux-2.6.30-2011-04-16

	Note that the openembedded git server will not		Note that the openembedded git server will not

UlfSamuelsson: /* Example 3: Working with a private branch */

2011-01-28T07:45:43Z

Example 3: Working with a private branch

← Older revision		Revision as of 07:45, 28 January 2011
Line 324:		Line 324:
	Remove your local branch:		Remove your local branch:

	git checkout org.openembedded.dev		git checkout origin/org.openembedded.dev
	git branch -d ulf/linux-2.6.30-2011-01-16		git branch -d ulf/linux-2.6.30-2011-01-16

UlfSamuelsson: /* Example 3: Working with a private branch */

2011-01-18T20:06:59Z

Example 3: Working with a private branch

← Older revision		Revision as of 20:06, 18 January 2011
Line 271:		Line 271:
	=== Example 3: Working with a private branch ===		=== Example 3: Working with a private branch ===

	Download and create a remote private branch "origin/ulf/linux-2.6.32".		Download and create a remote private branch "origin/ulf/linux-2.6.30-2011-01-16".
	The local copy of the branch will be called "ulf/linux-2.6.32"-		The local copy of the branch will be called "ulf/linux-2.6.30-2011-01-16"-
	When you do:		When you do:

Line 286:		Line 286:
	git config user.name "Ulf Samuelsson"		git config user.name "Ulf Samuelsson"
	git config user.email "ulf.samuelsson@atmel.com"		git config user.email "ulf.samuelsson@atmel.com"
	git checkout -b ulf/linux-2.6.32 origin/org.openembedded.dev		git checkout -b ulf/linux-2.6.30-2011-01-16 origin/org.openembedded.dev

	Add something:		Add something:
Line 295:		Line 295:

	Create a remote private branch from the local branch.		Create a remote private branch from the local branch.
	It will be called "origin/ulf/linux-2.6.32"		It will be called "origin/ulf/linux-2.6.30-2011-01-16"

	git push origin ulf/linux-2.6.32		git push origin ulf/linux-2.6.30-2011-01-16

	Create a local branch, based on your remote private branch:		Create a local branch, based on your remote private branch:

	git checkout -b ulf/linux-2.6.32 origin/ulf/linux-2.6.32		git checkout -b ulf/linux-2.6.30-2011-01-16 origin/ulf/linux-2.6.30-2011-01-16

	Add something to your local branch:		Add something to your local branch:
Line 311:		Line 311:
	Update your remote private branch:		Update your remote private branch:

	git push origin ulf/linux-2.6.32		git push origin ulf/linux-2.6.30-2011-01-16

	Once the remote branch has been updated from a local		Once the remote branch has been updated from a local
Line 325:		Line 325:

	git checkout org.openembedded.dev		git checkout org.openembedded.dev
	git branch -d ulf/linux-2.6.32		git branch -d ulf/linux-2.6.30-2011-01-16

	or possibly:		or possibly:

	git branch -D ulf/linux-2.6.32		git branch -D ulf/linux-2.6.30-2011-01-16

	Note that the openembedded git server will not		Note that the openembedded git server will not
	allow you to delete a private branch.		allow you to delete a private branch at this time.
	Send an email to the mailing list and this will be fixed.		Send an email to the mailing list and this will be fixed.

	[[Category:Dev]]		[[Category:Dev]]
	[[Category:User]]		[[Category:User]]

← Older revision		Revision as of 20:42, 22 November 2011
Line 271:		Line 271:
	=== Example 3: Working with a private branch ===		=== Example 3: Working with a private branch ===

	Download and create a remote private branch "origin/ulf/linux-2.6.39-2011-11-21".		Download and create a remote private branch "origin/ulf/linux-2.6.39-2011-11-22".
	The local copy of the branch will be called "ulf/linux-2.6.39-2011-11-21".		The local copy of the branch will be called "ulf/linux-2.6.39-2011-11-22".
	When you do:		When you do:

Line 286:		Line 286:
	git config user.name "Ulf Samuelsson"		git config user.name "Ulf Samuelsson"
	git config user.email "ulf_samuelsson@telia.com"		git config user.email "ulf_samuelsson@telia.com"
	git checkout -b ulf/linux-2.6.39-2011-11-21 origin/org.openembedded.dev		git checkout -b ulf/linux-2.6.39-2011-11-22 origin/org.openembedded.dev

	Add something:		Add something:
Line 295:		Line 295:

	Create a remote private branch from the local branch.		Create a remote private branch from the local branch.
	It will be called "origin/ulf/linux-2.6.39-2011-11-21"		It will be called "origin/ulf/linux-2.6.39-2011-11-22"

	git push origin ulf/linux-2.6.39-2011-11-21		git push origin ulf/linux-2.6.39-2011-11-22

	Create a local branch, based on your remote private branch:		Create a local branch, based on your remote private branch:

	git checkout -b ulf/linux-2.6.39-2011-11-21 origin/ulf/linux-2.6.39-2011-11-21		git checkout -b ulf/linux-2.6.39-2011-11-22 origin/ulf/linux-2.6.39-2011-11-22

	Add something to your local branch:		Add something to your local branch:
Line 311:		Line 311:
	Update your remote private branch:		Update your remote private branch:

	git push origin ulf/linux-2.6.39-2011-11-21		git push origin ulf/linux-2.6.39-2011-11-22

	Once the remote branch has been updated from a local		Once the remote branch has been updated from a local
Line 325:		Line 325:

	git checkout origin/org.openembedded.dev		git checkout origin/org.openembedded.dev
	git branch -d ulf/llinux-2.6.39-2011-11-21		git branch -d ulf/llinux-2.6.39-2011-11-22

	or possibly:		or possibly:

	git branch -D ulf/linux-2.6.39-2011-11-21		git branch -D ulf/linux-2.6.39-2011-11-22

	Note that the openembedded git server will not		Note that the openembedded git server will not

← Older revision		Revision as of 14:58, 21 November 2011
Line 286:		Line 286:
	git config user.name "Ulf Samuelsson"		git config user.name "Ulf Samuelsson"
	git config user.email "ulf_samuelsson@telia.com"		git config user.email "ulf_samuelsson@telia.com"
	git checkout -b ulf/linux-2.6.39-2011-11-18 origin/org.openembedded.dev		git checkout -b ulf/linux-2.6.39-2011-11-21 origin/org.openembedded.dev

	Add something:		Add something:
Line 295:		Line 295:

	Create a remote private branch from the local branch.		Create a remote private branch from the local branch.
	It will be called "origin/ulf/linux-2.6.39-2011-11-18"		It will be called "origin/ulf/linux-2.6.39-2011-11-21"

	git push origin ulf/linux-2.6.39-2011-11-18		git push origin ulf/linux-2.6.39-2011-11-21

	Create a local branch, based on your remote private branch:		Create a local branch, based on your remote private branch:

	git checkout -b ulf/linux-2.6.39-2011-11-18 origin/ulf/linux-2.6.39-2011-11-18		git checkout -b ulf/linux-2.6.39-2011-11-21 origin/ulf/linux-2.6.39-2011-11-21

	Add something to your local branch:		Add something to your local branch:
Line 311:		Line 311:
	Update your remote private branch:		Update your remote private branch:

	git push origin ulf/linux-2.6.39-2011-11-18		git push origin ulf/linux-2.6.39-2011-11-21

	Once the remote branch has been updated from a local		Once the remote branch has been updated from a local
Line 325:		Line 325:

	git checkout origin/org.openembedded.dev		git checkout origin/org.openembedded.dev
	git branch -d ulf/llinux-2.6.39-2011-11-18		git branch -d ulf/llinux-2.6.39-2011-11-21

	or possibly:		or possibly:

	git branch -D ulf/linux-2.6.39-2011-11-18		git branch -D ulf/linux-2.6.39-2011-11-21

	Note that the openembedded git server will not		Note that the openembedded git server will not