[plt-dev] Re: [plt] Push #20178: master branch updated

I have never typed 'git merge'. I do 'git pull'. You're asking me to
type two commands (git fetch, git merge)? So that there are three less
lines in a message that you've already shown you can identify and
potentially remove always? I've read the text and I don't see any
other justification for what you're talking about. Am I missing
something?

Jay

On Mon, May 10, 2010 at 5:41 PM, Eli Barzilay <eli at barzilay.org> wrote:
> Please take the time to read the git text that I wrote (specifically,
> the "dealing with conflicts" section).  Doing a merge commit for a
> single commit, as done in the following three cases, is something that
> has no use.
>
>
> On May  8, robby at racket-lang.org wrote:
>> =====[ 2 Commits ]======================================================
>>
>> a470b44 Robby Findler <robby at racket-lang.org> 2010-05-08 16:18
>> :
>> | Merge branch 'master' of git:plt
>> :
>> : *** Trivial merge (omitting list) ***
>
> On May 10, jay at racket-lang.org wrote:
>>
>> =====[ 2 Commits ]======================================================
>>
>> 10377c3 Jay McCarthy <jay at racket-lang.org> 2010-05-10 11:41
>> :
>> | Merge branch 'master' of git.racket-lang.org:plt
>> :
>> : *** Trivial merge (omitting list) ***
>
> On May 10, cce at racket-lang.org wrote:
>>
>> =====[ 2 Commits ]======================================================
>>
>> 9383546 Carl Eastlund <cce at racket-lang.org> 2010-05-10 16:39
>> :
>> | Merge branch 'master' of git:plt
>> :
>> : *** Trivial merge (omitting list) ***
>
> --
>          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
>                    http://barzilay.org/                   Maze is Life!
>



-- 
Jay McCarthy <jay at cs.byu.edu>
Assistant Professor / Brigham Young University
http://teammccarthy.org/jay

"The glory of God is Intelligence" - D&C 93