Git usage - Revision history

Ned Scott at 22:00, 17 November 2014

2014-11-17T22:00:01Z

← Older revision		Revision as of 22:00, 17 November 2014
Line 76:		Line 76:
	You then just rinse/repeat until all issues are ironed out. feature_rebase is then what is pulled into master nice and cleanly.		You then just rinse/repeat until all issues are ironed out. feature_rebase is then what is pulled into master nice and cleanly.
	[[Category:Development]]		[[Category:Development]]
	[[Category:~~XBMC~~ Manual]]		[[Category:Manual]]
	{{nobots}}		{{nobots}}

Ned Scott: Ned Scott moved page Git Usage to Git usage

2014-05-05T08:35:56Z

Ned Scott moved page Git Usage to Git usage

← Older revision	Revision as of 08:35, 5 May 2014
(No difference)

Martijn at 20:52, 31 August 2013

2013-08-31T20:52:09Z

← Older revision		Revision as of 20:52, 31 August 2013
Line 1:		Line 1:
			{{mininav\|[[Development]]}}

	==Git windows guide==		==Git windows guide==
	The guide for Windows users is located here: [[Git Usage Windows]]		The guide for Windows users is located here: [[Git Usage Windows]]

Ned Scott at 21:00, 27 July 2013

2013-07-27T21:00:54Z

← Older revision		Revision as of 21:00, 27 July 2013
Line 1:		Line 1:
	~~{{BehindScenes\|'''Using Git for XBMC development.'''}}~~
	==Git windows guide==		==Git windows guide==
	The guide for Windows users is located here: [[Git Usage Windows]]		The guide for Windows users is located here: [[Git Usage Windows]]

Ned Scott at 20:25, 6 May 2013

2013-05-06T20:25:25Z

← Older revision		Revision as of 20:25, 6 May 2013
Line 76:		Line 76:
	[[Category:Development]]		[[Category:Development]]
	[[Category:XBMC Manual]]		[[Category:XBMC Manual]]
			{{nobots}}

Ned Scott: Reverted edits by NedBot (talk) to last revision by Ned Scott

2013-05-06T20:25:03Z

Reverted edits by NedBot (talk) to last revision by Ned Scott

← Older revision		Revision as of 20:25, 6 May 2013
Line 1:		Line 1:
	{{BehindScenes\|'''Using Git for XBMC development.'''}}		{{BehindScenes\|'''Using Git for XBMC development.'''}}
	== Git windows guide ==		==Git windows guide==
	The guide for Windows users is located here: [[Git Usage Windows]]		The guide for Windows users is located here: [[Git Usage Windows]]
	== Clone the XBMC main repository ==		== Clone the XBMC main repository ==
Line 56:		Line 56:
	== Advanced ==		== Advanced ==
	=== Maintaining a rebased version of a merge branch ===		=== Maintaining a rebased version of a merge branch ===
	A long-lived feature branch involving a bunch of developers at some point needs merging to mainline. During the review stage, this typically involves someone taking the time to rebase the feature branch on mainline so that the changes are easier to review for others, with a pull request being made. Review will inevitably result in fix commits being required, and where many developers are involved this can be messy if constantly rebased (as devs are working against a moving target). An alternative is to have 2 branches: The first rebased branch changes to the development branch with fixup commits being applied. A second branch is then created which is identical to the first, just rebased down. In order to maintain this arrangement, you need to be able to apply the top N commits from the development branch onto the rebased branch to ensure it's kept up to date. This can be done as follows:		A long-lived feature branch involving a bunch of developers at some point needs merging to mainline. During the review stage, this typically involves someone taking the time to rebase the feature branch on mainline so that the changes are easier to review for others, with a pull request being made. Review will inevitably result in fix commits being required, and where many developers are involved this can be messy if constantly rebased (as devs are working against a moving target). An alternative is to have 2 branches: The first rebased branch changes to the development branch with fixup commits being applied. A second branch is then created which is identical to the first, just rebased down. In order to maintain this arrangement, you need to be able to apply the top N commits from the development branch onto the rebased branch to ensure it's kept up to date. This can be done as follows:
	<source lang="bash">		<source lang="bash">
	$ git checkout feature_branch		$ git checkout feature_branch
	$ git checkout -b feature_rebase		$ git checkout -b feature_rebase
	$ # ... do rebase ...		$ # ... do rebase ...
	$ git diff feature_branch # ensure your rebase hasn't dropped something.		$ git diff feature_branch # ensure your rebase hasn't dropped something.
	$ git checkout feature_branch		$ git checkout feature_branch
	$ git tag -f feature_last_rebase # so you know when you last rebased.		$ git tag -f feature_last_rebase # so you know when you last rebased.
	$ # ... more commits on top of feature_branch ...		$ # ... more commits on top of feature_branch ...
	$ git checkout feature_rebase		$ git checkout feature_rebase
	$ git checkout -b tmp # create a temporary branch		$ git checkout -b tmp # create a temporary branch
	$ git branch -f feature_rebase feature_branch # move feature_rebase to the HEAD of feature_branch		$ git branch -f feature_rebase feature_branch # move feature_rebase to the HEAD of feature_branch
	$ git rebase --onto tmp feature_last_rebase feature_rebase # rebase changes from the last rebase on top of feature_branch		$ git rebase --onto tmp feature_last_rebase feature_rebase # rebase changes from the last rebase on top of feature_branch
	$ git diff feature_branch # ensure your rebased branch contains all the commits you want		$ git diff feature_branch # ensure your rebased branch contains all the commits you want
	$ git branch -d tmp		$ git branch -d tmp
	$ # ... do rebase ...		$ # ... do rebase ...
	</source>		</source>
	You then just rinse/repeat until all issues are ironed out. feature_rebase is then what is pulled into master nice and cleanly.		You then just rinse/repeat until all issues are ironed out. feature_rebase is then what is pulled into master nice and cleanly.

	[[Category:Development]]		[[Category:Development]]
	[[Category:XBMC Manual]]		[[Category:XBMC Manual]]

>NedBot: Robot: Cosmetic changes

2013-05-06T20:23:45Z

Robot: Cosmetic changes

← Older revision		Revision as of 20:23, 6 May 2013
Line 1:		Line 1:
	{{BehindScenes\|'''Using Git for XBMC development.'''}}		{{BehindScenes\|'''Using Git for XBMC development.'''}}
	==Git windows guide==		== Git windows guide ==
	The guide for Windows users is located here: [[Git Usage Windows]]		The guide for Windows users is located here: [[Git Usage Windows]]
	== Clone the XBMC main repository ==		== Clone the XBMC main repository ==
Line 56:		Line 56:
	== Advanced ==		== Advanced ==
	=== Maintaining a rebased version of a merge branch ===		=== Maintaining a rebased version of a merge branch ===
	A long-lived feature branch involving a bunch of developers at some point needs merging to mainline. During the review stage, this typically involves someone taking the time to rebase the feature branch on mainline so that the changes are easier to review for others, with a pull request being made. Review will inevitably result in fix commits being required, and where many developers are involved this can be messy if constantly rebased (as devs are working against a moving target). An alternative is to have 2 branches: The first rebased branch changes to the development branch with fixup commits being applied. A second branch is then created which is identical to the first, just rebased down. In order to maintain this arrangement, you need to be able to apply the top N commits from the development branch onto the rebased branch to ensure it's kept up to date. This can be done as follows:		A long-lived feature branch involving a bunch of developers at some point needs merging to mainline. During the review stage, this typically involves someone taking the time to rebase the feature branch on mainline so that the changes are easier to review for others, with a pull request being made. Review will inevitably result in fix commits being required, and where many developers are involved this can be messy if constantly rebased (as devs are working against a moving target). An alternative is to have 2 branches: The first rebased branch changes to the development branch with fixup commits being applied. A second branch is then created which is identical to the first, just rebased down. In order to maintain this arrangement, you need to be able to apply the top N commits from the development branch onto the rebased branch to ensure it's kept up to date. This can be done as follows:
	<source lang="bash">		<source lang="bash">
	$ git checkout feature_branch		$ git checkout feature_branch
	$ git checkout -b feature_rebase		$ git checkout -b feature_rebase
	$ # ... do rebase ...		$ # ... do rebase ...
	$ git diff feature_branch # ensure your rebase hasn't dropped something.		$ git diff feature_branch # ensure your rebase hasn't dropped something.
	$ git checkout feature_branch		$ git checkout feature_branch
	$ git tag -f feature_last_rebase # so you know when you last rebased.		$ git tag -f feature_last_rebase # so you know when you last rebased.
	$ # ... more commits on top of feature_branch ...		$ # ... more commits on top of feature_branch ...
	$ git checkout feature_rebase		$ git checkout feature_rebase
	$ git checkout -b tmp # create a temporary branch		$ git checkout -b tmp # create a temporary branch
	$ git branch -f feature_rebase feature_branch # move feature_rebase to the HEAD of feature_branch		$ git branch -f feature_rebase feature_branch # move feature_rebase to the HEAD of feature_branch
	$ git rebase --onto tmp feature_last_rebase feature_rebase # rebase changes from the last rebase on top of feature_branch		$ git rebase --onto tmp feature_last_rebase feature_rebase # rebase changes from the last rebase on top of feature_branch
	$ git diff feature_branch # ensure your rebased branch contains all the commits you want		$ git diff feature_branch # ensure your rebased branch contains all the commits you want
	$ git branch -d tmp		$ git branch -d tmp
	$ # ... do rebase ...		$ # ... do rebase ...
	</source>		</source>
	You then just rinse/repeat until all issues are ironed out. feature_rebase is then what is pulled into master nice and cleanly.		You then just rinse/repeat until all issues are ironed out. feature_rebase is then what is pulled into master nice and cleanly.

	[[Category:Development]]		[[Category:Development]]
	[[Category:XBMC Manual]]		[[Category:XBMC Manual]]

Ned Scott at 19:50, 6 May 2013

2013-05-06T19:50:01Z

← Older revision		Revision as of 19:50, 6 May 2013
Line 1:		Line 1:
	{{BehindScenes\|'''Using Git for XBMC development.'''}}		{{BehindScenes\|'''Using Git for XBMC development.'''}}
	~~{{XBMC faq toc}}~~
	==Git windows guide==		==Git windows guide==
	The guide for Windows users is located here: [[Git Usage Windows]]		The guide for Windows users is located here: [[Git Usage Windows]]
Line 76:		Line 75:
	You then just rinse/repeat until all issues are ironed out. feature_rebase is then what is pulled into master nice and cleanly.		You then just rinse/repeat until all issues are ironed out. feature_rebase is then what is pulled into master nice and cleanly.
	[[Category:Development]]		[[Category:Development]]
			[[Category:XBMC Manual]]

>UNiversal at 16:15, 17 November 2012

2012-11-17T16:15:04Z

← Older revision		Revision as of 16:15, 17 November 2012
Line 1:		Line 1:
	{{BehindScenes\|'''Using Git for XBMC development.'''}}		{{BehindScenes\|'''Using Git for XBMC development.'''}}
	{{XBMC faq toc}}		{{XBMC faq toc}}
			==Git windows guide==
	The guide for Windows users is located here: [[Git Usage Windows]]		The guide for Windows users is located here: [[Git Usage Windows]]
	== Clone the XBMC main repository ==		== Clone the XBMC main repository ==

>UNiversal at 16:12, 17 November 2012

2012-11-17T16:12:22Z

← Older revision		Revision as of 16:12, 17 November 2012
Line 1:		Line 1:
			{{BehindScenes\|'''Using Git for XBMC development.'''}}
	{{XBMC faq toc}}		{{XBMC faq toc}}
	The guide for Windows users is located here: [[Git Usage Windows]]		The guide for Windows users is located here: [[Git Usage Windows]]