windows - Git says "Binary files a... and b... differ" on for *.reg files -


is there way force git in treating .reg files text? using git track windows registry tweaks , windows uses .reg these files.

update 1: got run diff (thanks, andrew). however, looks below. encoding issue?

index 0080fe3..fc51807 100644 --- a/install on rebuild/4. registry tweaks.reg +++ b/install on rebuild/4. registry tweaks.reg @@ -1,49 +1,48 @@ -<ff><fe>w^@i^@n^@d^@o^@w^@s^@ ^@r^@e^@g^@i^@s^@t^@r^@y^@ ^@e^@d^@i^@t^@o^@r^@ -^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@;^@; -^@^m^@ ...

any ideas?

update 2: helped: here's did in end: create file .gitattributes content *.reg text diff , converted files utf-8 utf-16 weird diffs. i'm not using foreign characters utf-8 works me.

to tell git explicitly diff filetype, put following in .gitattributes file in repository’s root directory:

*.reg diff

Comments

Post a Comment

Popular posts from this blog

apache - Add omitted ? to URLs -

i working on website cms reads page name of query string, e.g. http://exmaple.com/?pagename . trying create rewrite rule rewrite ? . so, user types in /pagename , taken /?pagename try this: rewriteengine on rewritecond %{request_filename} !-d rewritecond %{request_filename} !-f rewriterule ^/?(.*) index.php?$1 [l]
Read more

redirect - bbPress Forum - rewrite to wwww.mysite prohibits login -

i using bbpress installation without wordpress integration. the redirect of rewriteengine @ forum site works: rewriteengine on rewritecond %{http_host} ^forum.mysite.com$ rewriterule (.*)$ http://www.forum.mysite.com/$1 [r=301,l] the problem login pppress. bbpress login not recognize: http://www.forum.mysite/bb-login.php . it redirects to: http://forum.mysite.com/bb-login.php . i tried permalink settings none , name based, same issue. does uses redirect in bbpress or how can eliminate "double" content , redirect permanently www.? i redirected www.forum.mysite.com forum.mysite.com , achieved eliminate "double" content.
Read more

php - How can I stop spam on my custom forum/blog? -

so have custom built forum & blog system of late has been dealing lot of spam. if wordpress use akismet, if different common platform i'm sure i'd find plugin. there kind of static class can download this? using php. i'd still go akismet, if it. uses outside of wordpress, may have pay fee it, depending on use -- check terms , conditions -- it's option , easy implement in php using api. use api key wordpress. com account access. basically, grab whichever php client library takes fancy -- use alex potsides' php5 library -- plug in key, , it's handful of lines of code. here's bare bones of validation straight 1 of live sites: ... if ($akismet) { $akismet->setcommentauthor($name); $akismet->setcommentauthoremail($session->userinfo["email"]); $akismet->setcommentauthorurl(""); $akismet->setcommentcontent($sentence);...
Read more