Git Usage Windows - Revision history

RogueScholar: Begin article content refresh and expansion

2021-09-13T08:36:51Z

Begin article content refresh and expansion

← Older revision		Revision as of 08:36, 13 September 2021
Line 1:		Line 1:
	~~== Clone the~~ Kodi ~~main repository==~~		{{Main\|Git usage}}
	~~XBMC~~ now uses ~~git for~~ as its ~~main scm. The main repo is located at~~ [~~https~~:~~//github~~.~~com/xbmc/xbmc github]~~		{{See also\|Windows development}}
	~~In this guide we're using msysgit and Tortoisegit as frontend~~.		Kodi now uses [[w:Git\|Git]] as its [[w:Version control\|version control system]], or more simply, the method by which changes to the codebase are recorded. It offers many advantages to the Kodi development team, among them the ability for developers to make contributions from a wide variety of operating systems, including any version of the Windows operating system currently supported by Microsoft.

	=== ~~Command~~ line ===		== Working with the Kodi source code ==
	~~For~~ read only access		=== Clone the main repository ===
	<syntaxhighlight lang="~~bash~~" ~~enclose~~="~~div~~">		{{Notice\|As of September 2021, the main Kodi source code repository requires >730 MiB of available storage on your local system, and is constantly growing in size. Be sure you are willing to allocate at least that much disk space before attempting to clone it.\|Disk space requirements}}
	$ git clone ~~git~~://github.com/xbmc/xbmc.git		The main code repository is hosted at [https://github.com/xbmc/xbmc GitHub] and available in its entirety for anyone to examine without registering for an account. In this guide we're demonstrating a few common tasks when working with the Kodi source code, using the official [https://git-scm.com/download/win Git for Windows] implementation to add Git functionality to Windows and [https://tortoisegit.org/download/ TortoiseGit] as the "frontend" for the examples showing a GUI interface instead of the command line.

			==== Using the terminal ====
			To download a copy of the main repository to your Downloads folder with read-only access and make that your working directory, you can use either the traditional [https://www.lifewire.com/how-to-open-command-prompt-2618089 Command shell] or its newer replacement, [https://docs.microsoft.com/en-us/powershell/scripting/windows-powershell/starting-windows-powershell PowerShell]; both are included with every Windows installation by default and offer identical performance when using Git for Windows, the choice is dictated solely by what you're most familiar with.
			* Command Prompt:
			<syntaxhighlight lang="doscon" highlight="1,3,13,15">
			C:\> cd %USERPROFILE%\Downloads

			C:\Users\Username\Downloads\> git clone https://github.com/xbmc/xbmc.git
			Cloning into 'xbmc'...
			remote: Enumerating objects: 580599, done.
			remote: Counting objects: 100% (1932/1932), done.
			remote: Compressing objects: 100% (455/455), done.
			remote: Total 580599 (delta 987), reused 1763 (delta 910), pack-reused 578667
			Receiving objects: 100% (580599/580599), 733.52 MiB \| 4.54 MiB/s, done.
			Resolving deltas: 100% (431423/431423), done.
			Updating files: 100% (9234/9234), done.

			C:\Users\Username\Downloads\> cd xbmc

			C:\Users\Username\Downloads\xbmc>
			</syntaxhighlight>
			* Powershell:
			<syntaxhighlight lang="pwsh-session" highlight="1,7,16-17">
			PS C:\> Set-Location -Path "$Env:UserProfile\Downloads" -PassThru

			Path
			----
			C:\Users\Username\Downloads

			PS C:\Users\Username\Downloads\> git clone https://github.com/xbmc/xbmc.git
			Cloning into 'xbmc'...
			remote: Enumerating objects: 580599, done.
			remote: Counting objects: 100% (1932/1932), done.
			remote: Compressing objects: 100% (455/455), done.
			remote: Total 580599 (delta 987), reused 1763 (delta 910), pack-reused 578667
			Receiving objects: 100% (580599/580599), 733.52 MiB \| 4.54 MiB/s, done.
			Resolving deltas: 100% (431423/431423), done.
			Updating files: 100% (9234/9234), done.
			PS C:\Users\Username\Downloads\> Set-Location -Path ".\xbmc"
			PS C:\Users\Username\Downloads\xbmc>
	</syntaxhighlight>		</syntaxhighlight>

Line 19:		Line 59:
	</syntaxhighlight>		</syntaxhighlight>

	=== TortoiseGit ===		==== TortoiseGit ====
	* right click in your directory tree		* right click in your directory tree
	* choose "Git Clone"		* choose "Git Clone"
Line 27:		Line 67:
	* you can also use ssh keys for authentication.		* you can also use ssh keys for authentication.

	== Fetch old branches and extra history ==		=== Fetch old branches and extra history ===
	'''The following is ONLY useful for developers who wish to see extended Kodi history. Everyone else should stop here.'''		'''The following is ONLY useful for developers who wish to see extended Kodi history. Everyone else should stop here.'''
	Run this command from your tree. It requires git 1.6.5 or higher:		Run this command from your tree. It requires git 1.6.5 or higher:
Line 36:		Line 76:
	(Is this possible in gui too?)		(Is this possible in gui too?)

	== Platform Settings ==		=== Platform Settings ===
	=== Case Insensitive File Systems ===		==== Case Insensitive File Systems ====
	Git wants to run under a case sensitive file system but under OSX and Windows, the file system might be case insensitive. Make sure that core.ignorecase is properly set. Check with:		Git wants to run under a case sensitive file system but under OSX and Windows, the file system might be case insensitive. Make sure that core.ignorecase is properly set. Check with:
	<syntaxhighlight lang="bash" enclose="div">$ git config --list</syntaxhighlight>		<syntaxhighlight lang="bash" enclose="div">$ git config --list</syntaxhighlight>
Line 45:		Line 85:
	(true is the default value for msysgit)		(true is the default value for msysgit)

	=== Line Endings ===		==== Line Endings ====

	Windows users MUST use the git autocrlf feature. This is set by default by tortoise if you don't change it during the installation process. If it's not set, you can do so manually:		Windows users MUST use the git autocrlf feature. This is set by default by tortoise if you don't change it during the installation process. If it's not set, you can do so manually:
Line 56:		Line 96:
	while you are there you should enter your name and email in the fields above. Otherwise you'll be asked during the first push.		while you are there you should enter your name and email in the fields above. Otherwise you'll be asked during the first push.

	== Updating ==		=== Updating ===

	When updating from the main git repo (by default git will call this 'origin'), you should always rebase on top of your history, unless you know what you're doing.		When updating from the main git repo (by default git will call this 'origin'), you should always rebase on top of your history, unless you know what you're doing.
Line 72:		Line 112:
	*: [[File:Fetch_and_Rebase.png]]		*: [[File:Fetch_and_Rebase.png]]

	== Committing ==		=== Committing ===
	commit your local work to your local repository:		commit your local work to your local repository:
	* right click on the xbmc repo		* right click on the xbmc repo
Line 80:		Line 120:
	* press ok		* press ok

	== Pushing ==		=== Pushing ===
	Pushes your work from the local repository to the xbmc main repository at github.		Pushes your work from the local repository to the xbmc main repository at github.
	Please use <syntaxhighlight lang="bash" enclose="div">git log</syntaxhighlight> to look at the log before committing. If there are merge commits that you don't understand, please ask for help before pushing.		Please use <syntaxhighlight lang="bash" enclose="div">git log</syntaxhighlight> to look at the log before committing. If there are merge commits that you don't understand, please ask for help before pushing.
Line 89:		Line 129:

	Attention: this will push all your local committed changes to the xbmc main repo. I dunno if you can only choose certain commits via the gui.		Attention: this will push all your local committed changes to the xbmc main repo. I dunno if you can only choose certain commits via the gui.


	[[Category:Development]]		[[Category:Development]]

NedBot: Bot: Automated text replacement (- XBMC + Kodi )

2015-05-04T08:36:45Z

Bot: Automated text replacement (- XBMC + Kodi )

← Older revision		Revision as of 08:36, 4 May 2015
Line 1:		Line 1:
	== Clone the ~~XBMC~~ main repository==		== Clone the Kodi main repository==
	XBMC now uses git for as its main scm. The main repo is located at [https://github.com/xbmc/xbmc github]		XBMC now uses git for as its main scm. The main repo is located at [https://github.com/xbmc/xbmc github]
	In this guide we're using msysgit and Tortoisegit as frontend.		In this guide we're using msysgit and Tortoisegit as frontend.
Line 28:		Line 28:

	== Fetch old branches and extra history ==		== Fetch old branches and extra history ==
	'''The following is ONLY useful for developers who wish to see extended ~~XBMC~~ history. Everyone else should stop here.'''		'''The following is ONLY useful for developers who wish to see extended Kodi history. Everyone else should stop here.'''
	Run this command from your tree. It requires git 1.6.5 or higher:		Run this command from your tree. It requires git 1.6.5 or higher:
	<syntaxhighlight lang="bash" enclose="div">		<syntaxhighlight lang="bash" enclose="div">

NedBot: Robot: Substituting template: Name

2014-06-05T20:20:52Z

Robot: Substituting template: Name

← Older revision		Revision as of 20:20, 5 June 2014
Line 1:		Line 1:
	== Clone the ~~{{name}}~~ main repository==		== Clone the XBMC main repository==
	XBMC now uses git for as its main scm. The main repo is located at [https://github.com/xbmc/xbmc github]		XBMC now uses git for as its main scm. The main repo is located at [https://github.com/xbmc/xbmc github]
	In this guide we're using msysgit and Tortoisegit as frontend.		In this guide we're using msysgit and Tortoisegit as frontend.
Line 28:		Line 28:

	== Fetch old branches and extra history ==		== Fetch old branches and extra history ==
	'''The following is ONLY useful for developers who wish to see extended ~~{{name}}~~ history. Everyone else should stop here.'''		'''The following is ONLY useful for developers who wish to see extended XBMC history. Everyone else should stop here.'''
	Run this command from your tree. It requires git 1.6.5 or higher:		Run this command from your tree. It requires git 1.6.5 or higher:
	<syntaxhighlight lang="bash" enclose="div">		<syntaxhighlight lang="bash" enclose="div">

NedBot: Bot: Automated text replacement (- XBMC + {{name}} )

2014-06-05T01:05:05Z

Bot: Automated text replacement (- XBMC + {{name}} )

← Older revision		Revision as of 01:05, 5 June 2014
Line 1:		Line 1:
	== Clone the ~~XBMC~~ main repository==		== Clone the {{name}} main repository==
	XBMC now uses git for as its main scm. The main repo is located at [https://github.com/xbmc/xbmc github]		XBMC now uses git for as its main scm. The main repo is located at [https://github.com/xbmc/xbmc github]
	In this guide we're using msysgit and Tortoisegit as frontend.		In this guide we're using msysgit and Tortoisegit as frontend.
Line 28:		Line 28:

	== Fetch old branches and extra history ==		== Fetch old branches and extra history ==
	'''The following is ONLY useful for developers who wish to see extended ~~XBMC~~ history. Everyone else should stop here.'''		'''The following is ONLY useful for developers who wish to see extended {{name}} history. Everyone else should stop here.'''
	Run this command from your tree. It requires git 1.6.5 or higher:		Run this command from your tree. It requires git 1.6.5 or higher:
	<syntaxhighlight lang="bash" enclose="div">		<syntaxhighlight lang="bash" enclose="div">

NedBot: Bot: automated adding of 'enclose="div"' to syntaxhighlight

2014-03-14T06:43:33Z

Bot: automated adding of 'enclose="div"' to syntaxhighlight

← Older revision		Revision as of 06:43, 14 March 2014
Line 5:		Line 5:
	=== Command line ===		=== Command line ===
	For read only access		For read only access
	<syntaxhighlight lang="bash">		<syntaxhighlight lang="bash" enclose="div">
	$ git clone git://github.com/xbmc/xbmc.git		$ git clone git://github.com/xbmc/xbmc.git
	</syntaxhighlight>		</syntaxhighlight>

	For read/write access (Devs only) via ssh keys (your account needs to be added to the xbmc project on github)		For read/write access (Devs only) via ssh keys (your account needs to be added to the xbmc project on github)
	<syntaxhighlight lang="bash">		<syntaxhighlight lang="bash" enclose="div">
	$ git clone git@github.com:xbmc/xbmc.git		$ git clone git@github.com:xbmc/xbmc.git
	</syntaxhighlight>		</syntaxhighlight>

	For read/write access (Devs only) via user/pass (yourname needs to be added to the xbmc project on github)		For read/write access (Devs only) via user/pass (yourname needs to be added to the xbmc project on github)
	<syntaxhighlight lang="bash">		<syntaxhighlight lang="bash" enclose="div">
	$ git https://yourname@github.com/xbmc/xbmc.git		$ git https://yourname@github.com/xbmc/xbmc.git
	</syntaxhighlight>		</syntaxhighlight>
Line 30:		Line 30:
	'''The following is ONLY useful for developers who wish to see extended XBMC history. Everyone else should stop here.'''		'''The following is ONLY useful for developers who wish to see extended XBMC history. Everyone else should stop here.'''
	Run this command from your tree. It requires git 1.6.5 or higher:		Run this command from your tree. It requires git 1.6.5 or higher:
	<syntaxhighlight lang="bash">		<syntaxhighlight lang="bash" enclose="div">
	$ git fetch origin refs/old/heads/:refs/remotes/svn-migration/ refs/replace/:refs/replace/		$ git fetch origin refs/old/heads/:refs/remotes/svn-migration/ refs/replace/:refs/replace/
	</syntaxhighlight>		</syntaxhighlight>
Line 39:		Line 39:
	=== Case Insensitive File Systems ===		=== Case Insensitive File Systems ===
	Git wants to run under a case sensitive file system but under OSX and Windows, the file system might be case insensitive. Make sure that core.ignorecase is properly set. Check with:		Git wants to run under a case sensitive file system but under OSX and Windows, the file system might be case insensitive. Make sure that core.ignorecase is properly set. Check with:
	<syntaxhighlight lang="bash">$ git config --list</syntaxhighlight>		<syntaxhighlight lang="bash" enclose="div">$ git config --list</syntaxhighlight>
	if not set:		if not set:
	<syntaxhighlight lang="bash">$ git config --global core.ignorecase true</syntaxhighlight>		<syntaxhighlight lang="bash" enclose="div">$ git config --global core.ignorecase true</syntaxhighlight>

	(true is the default value for msysgit)		(true is the default value for msysgit)
Line 48:		Line 48:

	Windows users MUST use the git autocrlf feature. This is set by default by tortoise if you don't change it during the installation process. If it's not set, you can do so manually:		Windows users MUST use the git autocrlf feature. This is set by default by tortoise if you don't change it during the installation process. If it's not set, you can do so manually:
	<syntaxhighlight lang="bash">$ git config --system core.autocrlf true</syntaxhighlight>		<syntaxhighlight lang="bash" enclose="div">$ git config --system core.autocrlf true</syntaxhighlight>
	or via the gui:		or via the gui:
	* right click on you cloned xbmc directory		* right click on you cloned xbmc directory
Line 59:		Line 59:

	When updating from the main git repo (by default git will call this 'origin'), you should always rebase on top of your history, unless you know what you're doing.		When updating from the main git repo (by default git will call this 'origin'), you should always rebase on top of your history, unless you know what you're doing.
	<syntaxhighlight lang="bash">git pull --rebase</syntaxhighlight>		<syntaxhighlight lang="bash" enclose="div">git pull --rebase</syntaxhighlight>
	A safe bet is to set this to be done automatically.		A safe bet is to set this to be done automatically.
	<syntaxhighlight lang="bash">$ git config branch.master.rebase true</syntaxhighlight>		<syntaxhighlight lang="bash" enclose="div">$ git config branch.master.rebase true</syntaxhighlight>

	with the gui:		with the gui:
Line 82:		Line 82:
	== Pushing ==		== Pushing ==
	Pushes your work from the local repository to the xbmc main repository at github.		Pushes your work from the local repository to the xbmc main repository at github.
	Please use <syntaxhighlight lang="bash">git log</syntaxhighlight> to look at the log before committing. If there are merge commits that you don't understand, please ask for help before pushing.		Please use <syntaxhighlight lang="bash" enclose="div">git log</syntaxhighlight> to look at the log before committing. If there are merge commits that you don't understand, please ask for help before pushing.
	'''Never EVER force a push (non-fast-forward commit) to mainline. Ever. Doing so will result in your push privileges being revoked.		'''Never EVER force a push (non-fast-forward commit) to mainline. Ever. Doing so will result in your push privileges being revoked.
	* right click on the xbmc repo		* right click on the xbmc repo

NedBot: Bot: Automated text replacement (-class="wikitable" +class="prettytable" & -Available Tags +Available tags & - +)

2014-03-14T05:51:22Z

Bot: Automated text replacement (-class="wikitable" +class="prettytable" & -Available Tags +Available tags & -<source +<syntaxhighlight & -</source> +</syntaxhighlight>)

← Older revision		Revision as of 05:51, 14 March 2014
Line 5:		Line 5:
	=== Command line ===		=== Command line ===
	For read only access		For read only access
	<~~source~~ lang="bash">		<syntaxhighlight lang="bash">
	$ git clone git://github.com/xbmc/xbmc.git		$ git clone git://github.com/xbmc/xbmc.git
	</~~source~~>		</syntaxhighlight>

	For read/write access (Devs only) via ssh keys (your account needs to be added to the xbmc project on github)		For read/write access (Devs only) via ssh keys (your account needs to be added to the xbmc project on github)
	<~~source~~ lang="bash">		<syntaxhighlight lang="bash">
	$ git clone git@github.com:xbmc/xbmc.git		$ git clone git@github.com:xbmc/xbmc.git
	</~~source~~>		</syntaxhighlight>

	For read/write access (Devs only) via user/pass (yourname needs to be added to the xbmc project on github)		For read/write access (Devs only) via user/pass (yourname needs to be added to the xbmc project on github)
	<~~source~~ lang="bash">		<syntaxhighlight lang="bash">
	$ git https://yourname@github.com/xbmc/xbmc.git		$ git https://yourname@github.com/xbmc/xbmc.git
	</~~source~~>		</syntaxhighlight>

	=== TortoiseGit ===		=== TortoiseGit ===
Line 30:		Line 30:
	'''The following is ONLY useful for developers who wish to see extended XBMC history. Everyone else should stop here.'''		'''The following is ONLY useful for developers who wish to see extended XBMC history. Everyone else should stop here.'''
	Run this command from your tree. It requires git 1.6.5 or higher:		Run this command from your tree. It requires git 1.6.5 or higher:
	<~~source~~ lang="bash">		<syntaxhighlight lang="bash">
	$ git fetch origin refs/old/heads/:refs/remotes/svn-migration/ refs/replace/:refs/replace/		$ git fetch origin refs/old/heads/:refs/remotes/svn-migration/ refs/replace/:refs/replace/
	</~~source~~>		</syntaxhighlight>

	(Is this possible in gui too?)		(Is this possible in gui too?)
Line 39:		Line 39:
	=== Case Insensitive File Systems ===		=== Case Insensitive File Systems ===
	Git wants to run under a case sensitive file system but under OSX and Windows, the file system might be case insensitive. Make sure that core.ignorecase is properly set. Check with:		Git wants to run under a case sensitive file system but under OSX and Windows, the file system might be case insensitive. Make sure that core.ignorecase is properly set. Check with:
	<~~source~~ lang="bash">$ git config --list</~~source~~>		<syntaxhighlight lang="bash">$ git config --list</syntaxhighlight>
	if not set:		if not set:
	<~~source~~ lang="bash">$ git config --global core.ignorecase true</~~source~~>		<syntaxhighlight lang="bash">$ git config --global core.ignorecase true</syntaxhighlight>

	(true is the default value for msysgit)		(true is the default value for msysgit)
Line 48:		Line 48:

	Windows users MUST use the git autocrlf feature. This is set by default by tortoise if you don't change it during the installation process. If it's not set, you can do so manually:		Windows users MUST use the git autocrlf feature. This is set by default by tortoise if you don't change it during the installation process. If it's not set, you can do so manually:
	<~~source~~ lang="bash">$ git config --system core.autocrlf true</~~source~~>		<syntaxhighlight lang="bash">$ git config --system core.autocrlf true</syntaxhighlight>
	or via the gui:		or via the gui:
	* right click on you cloned xbmc directory		* right click on you cloned xbmc directory
Line 59:		Line 59:

	When updating from the main git repo (by default git will call this 'origin'), you should always rebase on top of your history, unless you know what you're doing.		When updating from the main git repo (by default git will call this 'origin'), you should always rebase on top of your history, unless you know what you're doing.
	<~~source~~ lang="bash">git pull --rebase</~~source~~>		<syntaxhighlight lang="bash">git pull --rebase</syntaxhighlight>
	A safe bet is to set this to be done automatically.		A safe bet is to set this to be done automatically.
	<~~source~~ lang="bash">$ git config branch.master.rebase true</~~source~~>		<syntaxhighlight lang="bash">$ git config branch.master.rebase true</syntaxhighlight>

	with the gui:		with the gui:
Line 82:		Line 82:
	== Pushing ==		== Pushing ==
	Pushes your work from the local repository to the xbmc main repository at github.		Pushes your work from the local repository to the xbmc main repository at github.
	Please use <~~source~~ lang="bash">git log</~~source~~> to look at the log before committing. If there are merge commits that you don't understand, please ask for help before pushing.		Please use <syntaxhighlight lang="bash">git log</syntaxhighlight> to look at the log before committing. If there are merge commits that you don't understand, please ask for help before pushing.
	'''Never EVER force a push (non-fast-forward commit) to mainline. Ever. Doing so will result in your push privileges being revoked.		'''Never EVER force a push (non-fast-forward commit) to mainline. Ever. Doing so will result in your push privileges being revoked.
	* right click on the xbmc repo		* right click on the xbmc repo

Ned Scott at 02:44, 27 November 2011

2011-11-27T02:44:07Z

← Older revision		Revision as of 02:44, 27 November 2011
Line 89:		Line 89:

	Attention: this will push all your local committed changes to the xbmc main repo. I dunno if you can only choose certain commits via the gui.		Attention: this will push all your local committed changes to the xbmc main repo. I dunno if you can only choose certain commits via the gui.

			[[Category:Development]]

>NedBot: Robot: Cosmetic changes

2011-09-07T16:10:48Z

Robot: Cosmetic changes

← Older revision		Revision as of 16:10, 7 September 2011
Line 3:		Line 3:
	In this guide we're using msysgit and Tortoisegit as frontend.		In this guide we're using msysgit and Tortoisegit as frontend.

	===Command line===		=== Command line ===
	For read only access		For read only access
	<source lang="bash">		<source lang="bash">
Line 19:		Line 19:
	</source>		</source>

	===TortoiseGit===		=== TortoiseGit ===
	* right click in your directory tree		* right click in your directory tree
	* choose "Git Clone"		* choose "Git Clone"
	*: [[~~image~~:Tortoise_clone.png]]		*: [[File:Tortoise_clone.png]]
	* replace yourname with your github user account		* replace yourname with your github user account
	* when asking for the password type in your github password.		* when asking for the password type in your github password.
Line 37:		Line 37:

	== Platform Settings ==		== Platform Settings ==
	=== Case Insensitive File Systems===		=== Case Insensitive File Systems ===
	Git wants to run under a case sensitive file system but under OSX and Windows, the file system might be case insensitive. Make sure that core.ignorecase is properly set. Check with:		Git wants to run under a case sensitive file system but under OSX and Windows, the file system might be case insensitive. Make sure that core.ignorecase is properly set. Check with:
	<source lang="bash">$ git config --list</source>		<source lang="bash">$ git config --list</source>
Line 45:		Line 45:
	(true is the default value for msysgit)		(true is the default value for msysgit)

	=== Line Endings===		=== Line Endings ===

	Windows users MUST use the git autocrlf feature. This is set by default by tortoise if you don't change it during the installation process. If it's not set, you can do so manually:		Windows users MUST use the git autocrlf feature. This is set by default by tortoise if you don't change it during the installation process. If it's not set, you can do so manually:
Line 70:		Line 70:
	* press '''Fetch&Rebase'''		* press '''Fetch&Rebase'''
	* press '''rebase (fast fwd)''' in the newly appearing dialog		* press '''rebase (fast fwd)''' in the newly appearing dialog
	*: [[~~image~~:Fetch_and_Rebase.png]]		*: [[File:Fetch_and_Rebase.png]]

	== Committing ==		== Committing ==
Line 85:		Line 85:
	'''Never EVER force a push (non-fast-forward commit) to mainline. Ever. Doing so will result in your push privileges being revoked.		'''Never EVER force a push (non-fast-forward commit) to mainline. Ever. Doing so will result in your push privileges being revoked.
	* right click on the xbmc repo		* right click on the xbmc repo
	* TortoiseGit -> Push...		* TortoiseGit -> Push...
	* press Ok		* press Ok

	Attention: this will push all your local committed changes to the xbmc main repo. I dunno if you can only choose certain commits via the gui.		Attention: this will push all your local committed changes to the xbmc main repo. I dunno if you can only choose certain commits via the gui.

>WiSo at 11:12, 7 January 2011

2011-01-07T11:12:05Z

← Older revision		Revision as of 11:12, 7 January 2011
Line 70:		Line 70:
	* press '''Fetch&Rebase'''		* press '''Fetch&Rebase'''
	* press '''rebase (fast fwd)''' in the newly appearing dialog		* press '''rebase (fast fwd)''' in the newly appearing dialog

	*: [[image:Fetch_and_Rebase.png]]		*: [[image:Fetch_and_Rebase.png]]

>WiSo at 11:11, 7 January 2011

2011-01-07T11:11:43Z

← Older revision		Revision as of 11:11, 7 January 2011
Line 70:		Line 70:
	* press '''Fetch&Rebase'''		* press '''Fetch&Rebase'''
	* press '''rebase (fast fwd)''' in the newly appearing dialog		* press '''rebase (fast fwd)''' in the newly appearing dialog

			*: [[image:Fetch_and_Rebase.png]]

	== Committing ==		== Committing ==