This is the mail archive of the
systemtap@sourceware.org
mailing list for the systemtap project.
Re: gitified
- From: David Smith <dsmith at redhat dot com>
- To: "Frank Ch. Eigler" <fche at redhat dot com>
- Cc: Wenji Huang <wenji dot huang at oracle dot com>, systemtap at sources dot redhat dot com
- Date: Wed, 16 Apr 2008 09:38:48 -0500
- Subject: Re: gitified
- References: <20080331163239.GA28118@redhat.com> <4805B507.1080701@oracle.com> <y0mve2hdgik.fsf@ton.toronto.redhat.com>
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
--
David Smith
dsmith@redhat.com
Red Hat
http://www.redhat.com
256.217.0141 (direct)
256.837.0057 (fax)