Bögershausen; Rom Walton; git@vger.kernel.org
Cc: boinc_...@ssl.berkeley.edu
Subject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on
the CR/LF changes made upstream
On 09/14/2014 10:51 AM, Torsten Bögershausen wrote:
>> It may be that there is a bug in the tools you are
On 09/14/2014 10:51 AM, Torsten Bögershausen wrote:
>> It may be that there is a bug in the tools you are using.
> I use git 2.1.0
>
The question was how the commit had been produced:
Rom, what are you using ?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a me
On 09/14/2014 10:51 AM, Torsten Bögershausen wrote:
> It may be that there is a bug in the tools you are using.
I use git 2.1.0
--
Toralf
pgp key: 0076 E94E
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info
On 12.09.14 20:19, Rom Walton wrote:
> Try:
> git checkout -f master
> git pull origin
>
> I committed fixes for that stuff this morning.
>
> - Rom
It seems as if we added CRLF's to the repo:
od -c html/languages/translations/hu.po | grep "\\\r"
0577300# # \r \n # P r
On 09/12/2014 09:10 PM, Rom Walton wrote:
> I found this:
> http://stackoverflow.com/questions/17223527/how-do-i-force-git-to-checkout-the-master-branch-and-remove-carriage-returns-aft
>
> That might help in the future.
This helped :
git reset --hard 9e860d0451
git pull
git clean -f
git gc
git p
:04 PM
To: Rom Walton; git@vger.kernel.org
Cc: boinc_...@ssl.berkeley.edu
Subject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on
the CR/LF changes made upstream
On 09/12/2014 08:55 PM, Rom Walton wrote:
> Crud...
>
> Well, personally, I would delete the locale dire
On 09/12/2014 08:55 PM, Rom Walton wrote:
> Crud...
>
> Well, personally, I would delete the locale directory and the two translation
> files in html.
>
> Do the 'git pull', and then switch between master and some other branch.
>
> like:
> git checkout -f client_release/7/7.4
> git checkout -f
e job done.
- Rom
-Original Message-
From: Toralf Förster [mailto:toralf.foers...@gmx.de]
Sent: Friday, September 12, 2014 2:32 PM
To: Rom Walton; git@vger.kernel.org
Cc: boinc_...@ssl.berkeley.edu
Subject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on
the CR/LF ch
On 09/12/2014 08:19 PM, Rom Walton wrote:
> Try:
> git checkout -f master
> git pull origin
>
> I committed fixes for that stuff this morning.
doesn't helped :
tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master
Already on 'master'
Your branch is behind 'origin/master' by 7 commits, and can b
...@ssl.berkeley.edu
Subject: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the
CR/LF changes made upstream
Today I run again into the CR/LF pain when I pulled from BOINC upstream and me
wonders how I can "repair" the repository using git-2.1.0 at a 32bit Linux
witho
Today I run again into the CR/LF pain when I pulled from BOINC upstream and me
wonders how I can "repair" the repository using git-2.1.0 at a 32bit Linux
without cloning the full repository again (as I did it in the past). FWIW I did
not changed anything locally, I just do pull regularly from up
11 matches
Mail list logo
