lkml.org 
[lkml]   [2008]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [ALSA PATCH] alsa-git merge request
At Fri, 10 Oct 2008 14:12:18 +0200 (CEST),
Jaroslav Kysela wrote:
>
> Linus, please pull from:
>
> git pull git://git.alsa-project.org/alsa-kernel.git for-linus
>
> gitweb interface:
>
> http://git.alsa-project.org/?p=alsa-kernel.git;a=shortlog;h=for-linus
>
> The GNU patch is available at:
>
> ftp://ftp.alsa-project.org/pub/kernel-patches/alsa-git-for-linus-2008-10-10.patch.gz
>
> The following files will be updated:

[Too bad that we had a power cut over a day long, so I couldn't react
quickly until now...]

Good to see you send the pull request fast.

As far as I looked at it, some recent commits are missing in this
tree. And, this tree would give a conflict with the update of Sparc
tree from Dave.
But, if Linus already pulled it, then it's fine, I'll prepare the next
pull stuff later.

*HOWEVER*: Jaroslav, please change your GIT management style to the
normal one.
You cherry-pick each commit on my git tree into yours,
i.e. effectively rebase and break the whole clean topic branches on my
git tree[*] (and even worse, you rebase at each time you sync, so it
breaks doubly!).

"Divide & conquer" is definitely no good way for GIT. "Pull & merge"
is the standard way.

So, I sincerely hope you'll switch to that normal style in future.

thanks,

Takashi


\
 
 \ /
  Last update: 2008-10-11 12:23    [W:0.037 / U:0.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site