On Tuesday 19 April 2005 05:38 pm, Linus Torvalds wrote:
>
> On Tue, 19 Apr 2005, Steven Cole wrote:
> >
> > I wasn't complaining about the 4 minutes, just the lack of feedback
> > during the majority of that time. And most of it was after the last
> > patching file message.
>
> That should be
On Tue, 19 Apr 2005, Steven Cole wrote:
>
> I wasn't complaining about the 4 minutes, just the lack of feedback
> during the majority of that time. And most of it was after the last
> patching file message.
That should be exactly the thing that the new "read-tree -m" fixes.
Before, when you
Dear diary, on Wed, Apr 20, 2005 at 01:04:48AM CEST, I got a letter
where Steven Cole <[EMAIL PROTECTED]> told me that...
> Then, the flurry of patching file blah messages, followed by a rather
> pregnant pause after the last patching message.
>
> I wasn't complaining about the 4 minutes, just
On Tuesday 19 April 2005 04:38 pm, Linus Torvalds wrote:
>
> On Tue, 19 Apr 2005, Steven Cole wrote:
> >
> > But perhaps a progress bar right about here might be
> > a good thing for the terminally impatient.
> >
> > real3m54.909s
> > user0m14.835s
> > sys 0m10.587s
> >
> > 4
Dear diary, on Wed, Apr 20, 2005 at 12:38:17AM CEST, I got a letter
where Linus Torvalds <[EMAIL PROTECTED]> told me that...
> Just say no to patches.
FYI, I've - per Junio's suggestion - made git merge's fast-forward to
apply show-diff output as a patch instead. This is roughly equal to
doing
Dear diary, on Wed, Apr 20, 2005 at 12:45:02AM CEST, I got a letter
where Junio C Hamano <[EMAIL PROTECTED]> told me that...
> > "PB" == Petr Baudis <[EMAIL PROTECTED]> writes:
>
> PB> I'm wondering if doing
>
> PB> if [ "$(show-diff)" ]; then
> PB> git diff | git apply
> PB> else
> PB>
On Wed, 20 Apr 2005, Petr Baudis wrote:
>
> I will probably not buy git-export, though. (That is, it is merged, but
> I won't make git frontend for it.) My "git export" already does
> something different, but more importantly, "git patch" of mine already
> does effectively the same thing as you
> "PB" == Petr Baudis <[EMAIL PROTECTED]> writes:
PB> I'm wondering if doing
PB> if [ "$(show-diff)" ]; then
PB> git diff | git apply
PB> else
PB> checkout-cache -f -a
PB> fi
PB> would actually buy us some time; or, how common is it for people to have
PB> no local changes
Dear diary, on Tue, Apr 19, 2005 at 10:20:47PM CEST, I got a letter
where Linus Torvalds <[EMAIL PROTECTED]> told me that...
> Pasky? Can you check my latest git stuff, notably read-tree.c and the
> changes to git-pull-script?
I've made git merge to use read-tree -m, HTH.
I will probably not
On Tue, 19 Apr 2005, Steven Cole wrote:
>
> But perhaps a progress bar right about here might be
> a good thing for the terminally impatient.
>
> real3m54.909s
> user0m14.835s
> sys 0m10.587s
>
> 4 minutes might be long enough to cause some folks to lose hope.
Well, the real
Dear diary, on Wed, Apr 20, 2005 at 12:19:01AM CEST, I got a letter
where Steven Cole <[EMAIL PROTECTED]> told me that...
> Linus Torvalds wrote:
> >
> >On Tue, 19 Apr 2005, Greg KH wrote:
> >
> >>Nice, it looks like the merge of this tree, and my usb tree worked just
> >>fine.
> >
> >
> >Yup, it
Linus Torvalds wrote:
On Tue, 19 Apr 2005, Greg KH wrote:
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.
Yup, it all seems to work out.
[many files patched]
patching file mm/mmap.c
patching file net/bridge/br_sysfs_if.c
patching file scripts/ver_linux
On Tue, Apr 19, 2005 at 01:20:47PM -0700, Linus Torvalds wrote:
>
>
> On Tue, 19 Apr 2005, Greg KH wrote:
> >
> > Ok, if you want some practice with "real" merges, feel free to merge from
> > the following two trees whenever you are ready:
> >
On Tue, 19 Apr 2005, Greg KH wrote:
>
> Ok, if you want some practice with "real" merges, feel free to merge from
> the following two trees whenever you are ready:
> kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
> for 11 aoe bugfix patches, and:
>
On Tue, Apr 19, 2005 at 12:40:44PM -0700, Linus Torvalds wrote:
> I'm still working out some performance issues with merges (the actual
> "merge" operation itself is very fast, but I've been trying to make the
> subsequent "update the working directory tree to the right thing" be much
> better).
On Tue, 19 Apr 2005, Greg KH wrote:
>
> Nice, it looks like the merge of this tree, and my usb tree worked just
> fine.
Yup, it all seems to work out.
> So, what does this now mean? Is your kernel.org git tree now going to
> be the "real" kernel tree that you will be working off of now?
On Mon, Apr 18, 2005 at 09:39:38PM -0700, Greg KH wrote:
> Alright, let's try some small i2c and w1 patches...
>
> Could you merge with:
> kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.
So, what does
On Mon, Apr 18, 2005 at 09:39:38PM -0700, Greg KH wrote:
Alright, let's try some small i2c and w1 patches...
Could you merge with:
kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.
So, what does this
On Tue, 19 Apr 2005, Greg KH wrote:
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.
Yup, it all seems to work out.
So, what does this now mean? Is your kernel.org git tree now going to
be the real kernel tree that you will be working off of now? Should
we
On Tue, Apr 19, 2005 at 12:40:44PM -0700, Linus Torvalds wrote:
I'm still working out some performance issues with merges (the actual
merge operation itself is very fast, but I've been trying to make the
subsequent update the working directory tree to the right thing be much
better).
Ok, if
On Tue, 19 Apr 2005, Greg KH wrote:
Ok, if you want some practice with real merges, feel free to merge from
the following two trees whenever you are ready:
kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
for 11 aoe bugfix patches, and:
On Tue, Apr 19, 2005 at 01:20:47PM -0700, Linus Torvalds wrote:
On Tue, 19 Apr 2005, Greg KH wrote:
Ok, if you want some practice with real merges, feel free to merge from
the following two trees whenever you are ready:
kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
Linus Torvalds wrote:
On Tue, 19 Apr 2005, Greg KH wrote:
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.
Yup, it all seems to work out.
[many files patched]
patching file mm/mmap.c
patching file net/bridge/br_sysfs_if.c
patching file scripts/ver_linux
Dear diary, on Wed, Apr 20, 2005 at 12:19:01AM CEST, I got a letter
where Steven Cole [EMAIL PROTECTED] told me that...
Linus Torvalds wrote:
On Tue, 19 Apr 2005, Greg KH wrote:
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.
Yup, it all seems to work
On Tue, 19 Apr 2005, Steven Cole wrote:
But perhaps a progress bar right about here might be
a good thing for the terminally impatient.
real3m54.909s
user0m14.835s
sys 0m10.587s
4 minutes might be long enough to cause some folks to lose hope.
Well, the real operations
Dear diary, on Tue, Apr 19, 2005 at 10:20:47PM CEST, I got a letter
where Linus Torvalds [EMAIL PROTECTED] told me that...
Pasky? Can you check my latest git stuff, notably read-tree.c and the
changes to git-pull-script?
I've made git merge to use read-tree -m, HTH.
I will probably not buy
PB == Petr Baudis [EMAIL PROTECTED] writes:
PB I'm wondering if doing
PB if [ $(show-diff) ]; then
PB git diff | git apply
PB else
PB checkout-cache -f -a
PB fi
PB would actually buy us some time; or, how common is it for people to have
PB no local changes whatsoever, and whether
On Wed, 20 Apr 2005, Petr Baudis wrote:
I will probably not buy git-export, though. (That is, it is merged, but
I won't make git frontend for it.) My git export already does
something different, but more importantly, git patch of mine already
does effectively the same thing as you do, just
Dear diary, on Wed, Apr 20, 2005 at 12:45:02AM CEST, I got a letter
where Junio C Hamano [EMAIL PROTECTED] told me that...
PB == Petr Baudis [EMAIL PROTECTED] writes:
PB I'm wondering if doing
PB if [ $(show-diff) ]; then
PB git diff | git apply
PB else
PB checkout-cache -f -a
PB
Dear diary, on Wed, Apr 20, 2005 at 12:38:17AM CEST, I got a letter
where Linus Torvalds [EMAIL PROTECTED] told me that...
Just say no to patches.
FYI, I've - per Junio's suggestion - made git merge's fast-forward to
apply show-diff output as a patch instead. This is roughly equal to
doing the
On Tuesday 19 April 2005 04:38 pm, Linus Torvalds wrote:
On Tue, 19 Apr 2005, Steven Cole wrote:
But perhaps a progress bar right about here might be
a good thing for the terminally impatient.
real3m54.909s
user0m14.835s
sys 0m10.587s
4 minutes might be long
Dear diary, on Wed, Apr 20, 2005 at 01:04:48AM CEST, I got a letter
where Steven Cole [EMAIL PROTECTED] told me that...
Then, the flurry of patching file blah messages, followed by a rather
pregnant pause after the last patching message.
I wasn't complaining about the 4 minutes, just the
On Tue, 19 Apr 2005, Steven Cole wrote:
I wasn't complaining about the 4 minutes, just the lack of feedback
during the majority of that time. And most of it was after the last
patching file message.
That should be exactly the thing that the new read-tree -m fixes.
Before, when you read
On Tuesday 19 April 2005 05:38 pm, Linus Torvalds wrote:
On Tue, 19 Apr 2005, Steven Cole wrote:
I wasn't complaining about the 4 minutes, just the lack of feedback
during the majority of that time. And most of it was after the last
patching file message.
That should be exactly the
34 matches
Mail list logo
