[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Unify line endings in localization test
From: |
Ralf Wildenhues |
Subject: |
Re: Unify line endings in localization test |
Date: |
Fri, 23 Jan 2009 07:57:54 +0100 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
* Peter Rosin wrote on Fri, Jan 23, 2009 at 12:01:00AM CET:
> Den 2009-01-22 21:54 skrev Ralf Wildenhues:
>>
>> 1) create, in your own repository, a new branch pr-tests-newline-fixes
>> containing this one patch, then merge this patch into both
>> pr-msvc-support and into master, then push the last two (no need to ever
>> push pr-tests-newline-fixes),
> I commited the attached using method 1. However I felt I had to base
> the new branch on the common ancestor of master and pr-msvc-support
> in order to get a clean(er) merge into both branches.
OK. That way you did not merge the rest of master's current changes
into pr-msvc-support. I would not have minded if you had done that,
either, but it doesn't matter.
> Also, I should
> perhaps have used a different merge message? I thought it looked ok
> in my local repo, but that was only because the temporary branch exists
> there, right?
The message was just fine. gitk --all looks good here.
Thanks,
Ralf
- Unify line endings in localization test, Peter Rosin, 2009/01/16
- Re: Unify line endings in localization test, Ralf Wildenhues, 2009/01/19
- Re: Unify line endings in localization test, Peter Rosin, 2009/01/19
- Re: Unify line endings in localization test, Peter Rosin, 2009/01/19
- Re: Unify line endings in localization test, Ralf Wildenhues, 2009/01/21
- Re: Unify line endings in localization test, Peter Rosin, 2009/01/22
- Re: Unify line endings in localization test, Ralf Wildenhues, 2009/01/22
- Re: Unify line endings in localization test, Peter Rosin, 2009/01/22
- Re: Unify line endings in localization test,
Ralf Wildenhues <=
- Re: Unify line endings in localization test, Peter Rosin, 2009/01/23
- Re: Unify line endings in localization test, Peter Rosin, 2009/01/23
- Re: Unify line endings in localization test, Ralf Wildenhues, 2009/01/24
- Re: Unify line endings in localization test, Eric Blake, 2009/01/24
- Re: Unify line endings in localization test, Ralf Wildenhues, 2009/01/24
- Re: Unify line endings in localization test, Peter Rosin, 2009/01/24
- Re: Unify line endings in localization test, Ralf Wildenhues, 2009/01/26