git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Toralf Förster" <toralf.foerster-Mmb7MZpHnFY@public.gmane.org>
To: Rom Walton <romw-egxtZiWXYP1AfugRpC6u6w@public.gmane.org>,
	git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: boinc_dev-C9EgComYM8RUAgJt6FLh2g@public.gmane.org
Subject: Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
Date: Sat, 13 Sep 2014 16:55:51 +0200	[thread overview]
Message-ID: <54145AF7.4090606@gmx.de> (raw)
In-Reply-To: <1BAFA9B4D550C347962F76F2E03B3BBB22C5FB-xy+Cp4waYzmnovBw3M9VzQFcV7zePqp5@public.gmane.org>

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 prune


-- 
Toralf
pgp key: 0076 E94E

  parent reply	other threads:[~2014-09-13 14:56 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-12 18:09 (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream Toralf Förster
2014-09-12 18:19 ` [boinc_dev] " Rom Walton
2014-09-12 18:32   ` Toralf Förster
2014-09-12 18:55     ` Rom Walton
2014-09-12 19:04       ` [boinc_dev] " Toralf Förster
2014-09-12 19:10         ` Rom Walton
     [not found]           ` <1BAFA9B4D550C347962F76F2E03B3BBB22C5FB-xy+Cp4waYzmnovBw3M9VzQFcV7zePqp5@public.gmane.org>
2014-09-13 14:55             ` Toralf Förster [this message]
2014-09-14  8:51   ` [boinc_dev] " Torsten Bögershausen
     [not found]     ` <54155708.7090508-S0/GAf8tV78@public.gmane.org>
2014-09-14  9:04       ` Toralf Förster
2014-09-14 11:23         ` [boinc_dev] " Torsten Bögershausen
2014-09-15 21:51           ` Rom Walton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54145AF7.4090606@gmx.de \
    --to=toralf.foerster-mmb7mzphnfy@public.gmane.org \
    --cc=boinc_dev-C9EgComYM8RUAgJt6FLh2g@public.gmane.org \
    --cc=git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=romw-egxtZiWXYP1AfugRpC6u6w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).