This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [RFC] Add a .gitattributes file for use with git-merge-changelog


Ping?  If nobody has anything else to say, I'm going to assume that such
a change is unobjectionable, and should not be listed in the ChangeLog.

Samuel Bronson <naesten@gmail.com> writes:

> Ouch; it looks like my last attempt to reply to this missed gdb-patches@
> due to a gmane accident?
>
> Samuel Bronson <naesten@gmail.com> writes:
>
>> Tom Tromey <tromey@redhat.com> writes:
>>>>>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes:
>>>
>>> Samuel> [Am I really supposed to CC this to gcc@ like binutils/MAINTAINERS
>>> Samuel> says I should?]
>>>
>>> I think just for files that are intended to be put in both trees and
>>> shared.
>>
>> Well, they're certainly welcome to add such a file to their repository.
>>
>>> Samuel> Individual users will still have to:
>>> Samuel>  1. Install git-merge-changelog
>>> Samuel>  2. Set up the merge driver in their git config
>>>
>>> What happens if they do not?
>>
>> Not much; git just falls back to the default ("text") merge driver in
>> that case.  (This appears to have been so obvious that nobody actually
>> bothered to document it?)
>>
>> I find myself wondering: how much commentary should go into the
>> .gitattributes file, and do such files get ChangeLog entries?

-- 
Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread!


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]