mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Jaroslav Kysela <perex@perex.cz>
Cc: Linus Torvalds <torvalds@osdl.org>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [ALSA PATCH] alsa-git merge request
Date: Sat, 11 Oct 2008 12:21:17 +0200	[thread overview]
Message-ID: <s5h7i8f8maq.wl%tiwai@suse.de> (raw)
In-Reply-To: <Pine.LNX.4.61.0810101409490.14793@tm8103.perex-int.cz>

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

  reply	other threads:[~2008-10-11 10:21 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-10 12:12 Jaroslav Kysela
2008-10-11 10:21 ` Takashi Iwai [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-07-14  9:09 Jaroslav Kysela
2008-08-24 21:30 ` Guillaume Chazarain
2008-08-25  5:50   ` Takashi Iwai
2008-08-25 21:36     ` Guillaume Chazarain
2008-08-25 22:43       ` Guillaume Chazarain
2008-08-26  5:59         ` Takashi Iwai
2008-08-26 21:10           ` Guillaume Chazarain
2008-08-27  6:02             ` Takashi Iwai
2008-01-31 17:04 Jaroslav Kysela
2008-01-31 23:24 ` Linus Torvalds
2007-11-19 18:35 Jaroslav Kysela
2007-11-20  6:48 ` Takashi Iwai
2007-11-20 19:20   ` Jaroslav Kysela
2007-10-23  6:14 Jaroslav Kysela
2007-10-16 15:08 Jaroslav Kysela
2007-07-20  9:39 Jaroslav Kysela
2007-05-31  9:07 Jaroslav Kysela
2007-05-16  9:50 Jaroslav Kysela
2007-05-09  9:59 Jaroslav Kysela
2007-05-03 12:51 Jaroslav Kysela
2007-03-14  7:28 Jaroslav Kysela
2007-03-06 14:20 Jaroslav Kysela
2007-02-14  7:46 Jaroslav Kysela
2007-02-14 17:53 ` Linus Torvalds
2007-02-09 14:02 Jaroslav Kysela
2007-02-09 14:15 ` Takashi Iwai
2007-02-09 14:40   ` Jaroslav Kysela
2007-02-09 14:47     ` Takashi Iwai
2007-02-09 15:00       ` Takashi Iwai
2007-02-09 15:30         ` Jaroslav Kysela
2007-02-09 15:58   ` Linus Torvalds
2007-02-09 16:07     ` Jaroslav Kysela
2007-01-23  8:31 Jaroslav Kysela
2007-01-09 14:04 Jaroslav Kysela
2006-12-20  8:52 Jaroslav Kysela
2006-12-15  7:52 Jaroslav Kysela
2006-12-15  8:13 ` Andrew Morton
2006-12-15  8:17   ` Andrew Morton
2006-12-15  8:44     ` Jaroslav Kysela
2006-12-15  8:45   ` Jaroslav Kysela
2006-12-15 16:00 ` Linus Torvalds
2006-11-28 14:11 Jaroslav Kysela
2006-10-22  9:09 Jaroslav Kysela
2006-10-06 18:27 Jaroslav Kysela
2006-09-23  9:23 Jaroslav Kysela

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5h7i8f8maq.wl%tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®