[Mono-dev] The new world of Git -- what else can we change :-)

[Avery Pennarun]

On Wed, Jul 28, 2010 at 4:31 AM, Raja R Harinath <harinath at hurrynot.org> wrote:
> Avery Pennarun <apenwarr at gmail.com> writes:
>> However, it's just so easy to do this:
>>
>>     git checkout master
>>       # do stuff
>>     git commit -a
>>     git pull
>>     git push
>>
>> That I think asking people to do fancier stuff is kind of cruel most
>> of the time.
>
> I agree, but that also led us to:
>
>  http://mono-project.com/GitFAQ#When_I_commit.2C_my_commit_.22repeats.22_commits_of_other_people

Eeeow!  That there is some terrible advice!  I assume you know that,
which is why you pointed it out.  If you disagree, I can go on at more
length :)

>> I learned that it's really just a waste of time, because the history
>> graphs really aren't that useful to humans, and git itself doesn't
>> care if they're pretty.  It's much better to ignore them and get along
>> with work.
>
> If you have to a bone to pick with me, it should be for me being too
> reluctant to replace the answer above with
>
>  "They are merge commits.  Git has them.  Github screws up when it
>  displays them.  Nothing to see, move along"
>
> and, maybe, that I said
>
>  "Here's this nice branch-based workflow"
>
> in the original mail.  Okay, suggestion 3 is out :-)

The github people are pretty responsive, actually.  Maybe you can ask
them to clear up the UI for viewing merge commits a little bit.

It really is extremely scary to be adjusting your workflow just
because of a github display bug.

Have fun,

Avery