This is the mail archive of the mailing list for the GDB 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: GDB 7.6.90 available for testing

On 01/13/2014 07:15 PM, Eli Zaretskii wrote:
>> Date: Mon, 13 Jan 2014 20:50:28 +0200
>> From: Eli Zaretskii <>
>> Cc:,
>> Is there any difference between merge and cherry-pick in this case?

merge would attempt to merge the whole of master into the branch
starting from the branching point.

> It seems msysgit's cherry-pick somehow converted gdbserver/ChangeLog
> to DOS CRLF EOL format.  So I needed one additional commit on the
> branch to fix that, before pushing.  Is that OK, or should I have done
> something different?

Ouch, sounds like a git bug...

Yeah, it would have been better if that broken EOL change
hadn't made it into the repository.  E.g., now "git blame"
on gdbserver's ChangeLog will show that commit as author
of all of the file's lines.  Luckily, as it was on the branch,
not master, it probably won't ever affect anyone.  You could,
for example, have squashed those two commits into one (with git
rebase) before pushing, ending up with a single commit that
looked just like the one in master.  Oh well, what's done is
done now.  ;-)

Pedro Alves

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