[D-runtime] [D-Programming-Language/druntime] 08687b: Merge branch 'master' of github.com:D-Programming-...

[Alex]

Hi,

Rule of thumb: *Always* git pull --rebase origin master when you want
to pull. That makes sure to rebase your changes on top of the incoming
ones, thus avoiding a merge.

Regards,
Alex

On Fri, Sep 2, 2011 at 8:56 PM, Walter Bright <walter at digitalmars.com> wrote:
> I'm not sure what happened here. I just did a git pull, and the next push I
> did did this.
>
>> Yipes!  I know I use "git pull" a lot too, but we should really all try to
>> use "rebase" instead.  This diff is enormous.
>>
>> On Sep 1, 2011, at 3:51 PM, noreply at github.com wrote:
>>
>>>  Branch: refs/heads/master
>>>  Home:   https://github.com/D-Programming-Language/druntime
>>>
>>>  Commit: 08687bd705f1e516c2198ef098f571e599a761a4
>>>
>>>  https://github.com/D-Programming-Language/druntime/commit/08687bd705f1e516c2198ef098f571e599a761a4
>>>  Author: Walter Bright<walter at walterbright.com>
>>>  Date:   2011-09-01 (Thu, 01 Sep 2011)
>>>
>>>  Changed paths:
>>>    M changelog.dd
>>>  M import/object.di
>>>  M posix.mak
>>>  M src/core/atomic.d
>>>  M src/core/demangle.d
>>>  M src/core/memory.d
>>>  M src/core/runtime.d
>>>  M src/core/sync/semaphore.d
>>>  M src/core/sys/posix/arpa/inet.d
>>>  M src/core/sys/posix/dirent.d
>>>  M src/core/sys/posix/netinet/in_.d
>>>  M src/core/sys/windows/dbghelp.d
>>>  M src/core/sys/windows/stacktrace.d
>>>  M src/core/sys/windows/windows.d
>>>  M src/gc/gcx.d
>>>  M src/object_.d
>>>  M src/rt/aApply.d
>>>  M src/rt/aApplyR.d
>>>  M src/rt/aaA.d
>>>  M src/rt/trace.d
>>>  M src/rt/typeinfo/ti_AC.d
>>>  M src/rt/typeinfo/ti_Acdouble.d
>>>  M src/rt/typeinfo/ti_Acfloat.d
>>>  M src/rt/typeinfo/ti_Acreal.d
>>>  M src/rt/typeinfo/ti_Adouble.d
>>>  M src/rt/typeinfo/ti_Afloat.d
>>>  M src/rt/typeinfo/ti_Ag.d
>>>  M src/rt/typeinfo/ti_Aint.d
>>>  M src/rt/typeinfo/ti_Along.d
>>>  M src/rt/typeinfo/ti_Areal.d
>>>  M src/rt/typeinfo/ti_Ashort.d
>>>  M src/rt/typeinfo/ti_C.d
>>>  M src/rt/typeinfo/ti_byte.d
>>>  M src/rt/typeinfo/ti_cdouble.d
>>>  M src/rt/typeinfo/ti_cfloat.d
>>>  M src/rt/typeinfo/ti_char.d
>>>  M src/rt/typeinfo/ti_creal.d
>>>  M src/rt/typeinfo/ti_dchar.d
>>>  M src/rt/typeinfo/ti_delegate.d
>>>  M src/rt/typeinfo/ti_double.d
>>>  M src/rt/typeinfo/ti_float.d
>>>  M src/rt/typeinfo/ti_int.d
>>>  M src/rt/typeinfo/ti_long.d
>>>  M src/rt/typeinfo/ti_ptr.d
>>>  M src/rt/typeinfo/ti_real.d
>>>  M src/rt/typeinfo/ti_short.d
>>>  M src/rt/typeinfo/ti_ubyte.d
>>>  M src/rt/typeinfo/ti_uint.d
>>>  M src/rt/typeinfo/ti_ulong.d
>>>  M src/rt/typeinfo/ti_ushort.d
>>>  M src/rt/typeinfo/ti_void.d
>>>  M src/rt/typeinfo/ti_wchar.d
>>>  M src/rt/util/string.d
>>>  M test/gcbench/tree1.d
>>>
>>>  Log Message:
>>>  -----------
>>>  Merge branch 'master' of github.com:D-Programming-Language/druntime
>>>
>>>
>>>  Commit: 162f885d2fadac75e407e7884d6687c2fd82a15d
>>>
>>>  https://github.com/D-Programming-Language/druntime/commit/162f885d2fadac75e407e7884d6687c2fd82a15d
>>>  Author: Walter Bright<walter at walterbright.com>
>>>  Date:   2011-09-01 (Thu, 01 Sep 2011)
>>>
>>>  Changed paths:
>>>    M win32.mak
>>>
>>>  Log Message:
>>>  -----------
>>>  update manifest
>>>
>>>
>>> Compare:
>>> https://github.com/D-Programming-Language/druntime/compare/3440de4...162f885
>>> _______________________________________________
>>> D-runtime mailing list
>>> D-runtime at puremagic.com
>>> http://lists.puremagic.com/mailman/listinfo/d-runtime
>>
>> _______________________________________________
>> D-runtime mailing list
>> D-runtime at puremagic.com
>> http://lists.puremagic.com/mailman/listinfo/d-runtime
>>
>>
> _______________________________________________
> D-runtime mailing list
> D-runtime at puremagic.com
> http://lists.puremagic.com/mailman/listinfo/d-runtime
>