GIT Server - Revision history

Perex: /* Syncing the branch release in alsa-driver.git */

2012-12-17T15:37:34Z

‎Syncing the branch release in alsa-driver.git

2012-12-17T15:37:11Z

‎Syncing the branch release in alsa-driver.git

2012-09-25T10:34:44Z

‎Clone repositories

2012-09-25T09:57:49Z

‎Syncing the branch release in alsa-driver.git

2012-09-25T09:55:57Z

‎get up to date

2012-09-25T09:55:34Z

‎get up to date

2012-09-25T09:51:16Z

‎clone the repository

2012-09-25T09:50:34Z

‎clone the repository

2012-09-25T09:50:21Z

‎clone the repository

2012-09-25T09:39:39Z

‎Push branch changes to ALSA GIT repository

@@ Line 139: / Line 139: @@
                   git checkout mirror && git pull origin mirror && \
                   git checkout release
-	apush = !git push --tags origin release && git push origin build && \
+        apush = !git push --tags origin release && git push origin build && \
-		 git push origin mirror
+                 git push origin mirror
          bmerge = !git checkout release && git merge --log build
          mmerge = !git checkout release && git merge --log mirror

@@ Line 139: / Line 139: @@
                   git checkout mirror && git pull origin mirror && \
                   git checkout release
          bmerge = !git checkout release && git merge --log build
          mmerge = !git checkout release && git merge --log mirror

@@ Line 145: / Line 145: @@
   git clone git@git.alsa-project.org:alsa-driver.git alsa-driver
   git clone git@git.alsa-project.org:alsa-kernel.git alsa-kernel
@@ Line 153: / Line 158: @@
 To make a remote branch local:
-  git checkout -b for-linus origin/for-linus
+  git checkout -b for-linus remotes/origin/for-linus
-  git checkout -b linux-2.6 origin/linux-2.6
+  git checkout -b linux-2.6 remotes/origin/linux-2.6
 ===Update and rebase using Linus's 2.6 kernel tree===

@@ Line 135: / Line 135: @@
    [alias]
          bmerge = !git checkout release && git merge --log build
          mmerge = !git checkout release && git merge --log mirror

@@ Line 260: / Line 260: @@
   git checkout build
   git pull origin build
   git checkout release
   git pull origin release

@@ Line 256: / Line 256: @@
 ===get up to date===
-For both alsa-kmirror and alsa-driver
-  git pull
+ cd alsa-driver
 Sometimes you can just make and things will be fine. However, when there have been changes to the build system etc, its best to do a make clean; ./gitcompile to get the tree properly up to date.
 [[Category:Development]]

@@ Line 209: / Line 209: @@
 ===clone the repository===
   git clone git://git.alsa-project.org/alsa-driver.git alsa-driver
 If you live behind a firewall that blocks the git protocol, you can do this instead:
   git clone http://git.alsa-project.org/http/alsa-driver.git alsa-driver
 Note: You may do changes directly in the Linus's kernel GIT tree and send the patches from it.

@@ Line 172: / Line 172: @@
 ===Push branch changes to ALSA GIT repository===
-  git push --tags origin master:refs/heads/master
+  git push --tags origin master
-  git push --tags origin linux-2.6:refs/heads/linux-2.6
+  git push --tags origin linux-2.6
-  git push --tags origin for-linus:refs/heads/for-linus
+  git push --tags origin for-linus
 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 - please, ask Jaroslav Kysela < perex at perex . cz > if you can do this for branch 'master'.