Hi Greg,
On Tue, Jun 26, 2012 at 12:14 PM, Greg Ungerer <[email protected]> wrote:
> On 06/26/2012 08:03 PM, Geert Uytterhoeven wrote:
>> On Tue, Jun 26, 2012 at 11:57 AM, Greg Ungerer<[email protected]> wrote:
>>> On 06/26/2012 05:47 PM, Geert Uytterhoeven wrote:
>>>> On Tue, Jun 26, 2012 at 7:16 AM, Greg Ungerer<[email protected]>
>>>> wrote:
>>>>> On 06/25/2012 05:59 PM, Geert Uytterhoeven wrote:
>>>>>> On Mon, Jun 25, 2012 at 3:29 AM,<[email protected]> wrote:
>>>>>>> arch/m68k/include/asm/mcfne.h | 129 +---------
>>>>>>
>>>>>> mcf8390.h?
>>>>>> mcfne.h is queued for removal.
>>>>>
>>>>> I was trying to save it :-)
>>>>> Do you think I should just silently move the modified mcfne.h
>>>>> to a mcf8390.h?
>>>>
>>>> Sure. Why not?
>>>
>>> We lose any git history linking the original and new file.
>>
>> Your commit renaming-and-modifying it will provide the link?
>
> I would normally do that with a "git mv". But isn't that going to
> clash with your "git rm"? Or am I mis-understanding what you mean?
It may indeed give a merge conflict.
If the conflict is too complicated (we'll see in -next), I can remove its
scheduled deletion.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
