This is the mail archive of the systemtap@sourceware.org mailing list for the systemtap project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: gitified

From: Wenji Huang <wenji dot huang at oracle dot com>
To: David Smith <dsmith at redhat dot com>
Cc: "Frank Ch. Eigler" <fche at redhat dot com>, systemtap at sources dot redhat dot com
Date: Thu, 17 Apr 2008 09:25:48 +0800
Subject: Re: gitified
References: <20080331163239.GA28118@redhat.com> <4805B507.1080701@oracle.com> <y0mve2hdgik.fsf@ton.toronto.redhat.com> <48060F78.8090006@redhat.com>

David Smith wrote:

Frank Ch. Eigler wrote:

Wenji Huang <wenji.huang@oracle.com> writes:

[...]
Just made a small change in scsi.stp and pushed it to remote
repository as above instructions.

Yup, the change came through in commit 10202d.

Very strange to found that there are lots of trivial mergering logs
from me, also others.  [...]


Perhaps you ran a manual "git merge" a few times between local
branches unnecessarily.  But I wouldn't worry about it.

I've noticed the same thing.  So, yesterday I started trying to use the
strategy outlined here, which is basically to use "git rebase" instead
of "git merge":

https://www.redhat.com/archives/cluster-devel/2008-March/msg00029.html

Got it.
Frank, David, Thanks!

Regards,
Wenji

References:
- Re: gitified
  - From: Wenji Huang
- Re: gitified
  - From: Frank Ch. Eigler
- Re: gitified
  - From: David Smith

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]