Our server runs an older version of git.
1.7.1
We are in the process of migrating to a new server which runs a more up-to-date
distro.
- Rom
-Original Message-
From: Torsten Bögershausen [mailto:tbo...@web.de]
Sent: Sunday, September 14, 2014 7:23 AM
To: Toralf Förster; Torsten
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 i v
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 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 message
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
Try:
git checkout -f master
git pull origin
I committed fixes for that stuff this morning.
- Rom
-Original Message-
From: boinc_dev [mailto:boinc_dev-boun...@ssl.berkeley.edu] On Behalf Of Toralf
Förster
Sent: Friday, September 12, 2014 2:09 PM
To: git@vger.kernel.org
Cc:
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 be
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 master
It is round about, but it should get the job done.
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 master
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.
- Rom
-Original Message-
From: Toralf Förster [mailto:toralf.foers...@gmx.de]
Sent: Friday, September 12, 2014
10 matches
Mail list logo
