kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

On 9/1/2016 4:18 PM, Chris Pavlina wrote:
> On Thu, Sep 01, 2016 at 04:10:13PM -0400, Wayne Stambaugh wrote:
>> On 9/1/2016 2:29 PM, José Ignacio wrote:
>>> On Thu, Sep 1, 2016 at 12:02 PM, Wayne Stambaugh <stambaughw@xxxxxxxxx> wrote:
>>>> Sorry it took so long.  I took a look at Cirilo's changes an it looks
>>>> good.  We still need a PKGBUILD file for msys2 with JPs patch so we
>>>> don't have to build oce from source.
>>>>
>>>> When I merge Cirilo's 3d-plugin branch and I had to create a commit
>>>> message which made me the commit author.  This seems brain dead to me.
>>>> Here is the new commit log entry:
>>>>
>>>> commit 12c26047bffd54ccbb88348acfe7f653556450da
>>>> Merge: fcedef8 b656a81
>>>> Author: Wayne Stambaugh <stambaughw@xxxxxxxxx>
>>>> Date:   Thu Sep 1 11:59:44 2016 -0400
>>>>
>>>>     Merge remote-tracking branch 'cirilo/3d-plugin'
>>>>
>>>> I really only want to show Cirilo's commit log entries as a new commit.
>>>> WTF! I'm liking git less every time I use it.  What do I need to do to
>>>> get the correct commit history from Cirlo's 3d-plugin branch?
>>>>
>>>
>>> Cirilo's commit history remains intact in the merged branch, you just
>>> need to walk through that branch instead of master when reading the
>>> commit logs. If cirilo's branch was rebased to the current master you
>>> could do a fast-forward merge, which would graft his commits into the
>>> master branch and make his last commit the "new master". In either
>>> case the history is perfectly readable.
>>>
>>
>> Yes but before I got chance to push my branch, Chris pushed a change so
>> when I pulled his changes, git conveniently created yet another commit
>> message.  Do we really want all this extra cruft in the commit log or do
>> we want to rebase against the kicad master?
> 
> Start using git pull --rebase like I suggested earlier, it would avoid
> that.
> 

I pushed Cirilo's OCE changes so hopefully I didn't fsck up the main
repo too badly.  Thank you Cirilo for the OCE plugin work.