https://www.alsa-project.org/main/api.php?action=feedcontributions&feedformat=atom&user=ErnimrilAlsaProject - User contributions [en]2026-04-13T02:01:50ZUser contributionsMediaWiki 1.39.0https://www.alsa-project.org/main/index.php?title=GIT_Server&diff=1556GIT Server2008-05-04T19:59:04Z<p>Ernimril: /* Branches */ fix typo</p>
<hr />
<div>{| align="right"<br />
| __TOC__<br />
|}<br />
=alsa-kernel repository=<br />
<br />
==Anonymous access==<br />
<br />
===Read only GIT server===<br />
<br />
git clone git://git.alsa-project.org/alsa-kernel.git alsa-kernel<br />
<br />
===Web interface===<br />
<br />
http://git.alsa-project.org/?p=alsa-kernel.git<br />
<br />
==For developers==<br />
<br />
===Clone repository===<br />
<br />
git clone git@git.alsa-project.org:alsa-kernel.git alsa-kernel<br />
<br />
To show all branches (includes remote ones):<br />
<br />
git branch -a<br />
<br />
To make a remote branch local:<br />
<br />
git checkout -b for-linus origin/for-linus<br />
git checkout -b linux-2.6 origin/linux-2.6<br />
<br />
===Update and rebase using Linus's 2.6 kernel tree===<br />
<br />
Add remote URL:<br />
<br />
git remote add linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git<br />
<br />
Checkout linux-2.6 branch:<br />
<br />
git checkout linux-2.6<br />
<br />
Pull Linus's 2.6 changes:<br />
<br />
git pull linux-2.6 master<br />
<br />
Rebase our main ALSA development master branch with linux-2.6:<br />
<br />
git rebase linux-2.6 master<br />
<br />
===Push branch changes to ALSA GIT repository===<br />
<br />
git push --tags origin master:refs/head/master<br />
git push --tags origin linux-2.6:refs/head/linux-2.6<br />
git push --tags origin for-linus:refs/head/for-linus<br />
<br />
Note: Especially after 'git rebase' the repository on server is not consistent with local repository (remote ref is not ancestor of the local ref for master branch), so you have to use --force parameter for 'git push' command. Note that this might be dangerous - we probably need to settle a locking mechanism to prevent inconsistent changes.<br />
<br />
===Branches===<br />
<br />
; master<br />
: this branch is for main development (Andrew Morton will get patches for mm tree)<br />
<br />
; for-linus<br />
: this branch is for mainstream tree (for Linus Torvalds)<br />
<br />
; linux-2.6<br />
: this is official linux 2.6 mainstream tree<br />
<br />
; stable-2.6.<number><br />
: patches for stable 2.6 kernels<br />
<br />
; private-*<br />
: all developers can create a private branch to test a particular set of patches, prefix for these branches is 'private-' (for example private-alsabug-1234, private-tiwai-vmaster etc.)<br />
<br />
===Maintenance===<br />
<br />
GIT server is maintaned by [[User:Perex]].<br />
<br />
[[Category:Development]]</div>Ernimril