msysgit

Git sh.exe process forking issue on windows XP, slow?

空扰寡人 提交于 2019-11-27 02:51:36
问题 Git is essential to my workflow. I run MSYS Git on Windows XP on my quad core machine with 3GB of RAM, and normally it is responsive and zippy. Suddenly an issue has cropped up whereby it takes >30 seconds to run any command from the Git Bash command prompt, including ls or cd . Interestingly, from the bash prompt it looks likes ls runs fairly quickly, I can then see the output from ls , but it then takes ~30 seconds for the prompt to return. If I switch to the windows command prompt (by

github: No supported authentication methods available

无人久伴 提交于 2019-11-27 02:39:28
i use github and have successfully added and synched files on my laptop in the past. as of recent i started getting " PuTTY Fatal Error: Disconnected: No supported authentication methods available " after running: git pull origin master (or push) however ssh git@github.com returns the correct response: ERROR: Hi username! You've successfully authenticated, but GitHub does not provide shell access Connection to github.com closed. after digging around on github i found this morcel: No supported authentication methods available You should be aware of the environment variable GIT_SSH, which is

Git - Ignore certain files contained in specific folders

旧街凉风 提交于 2019-11-27 01:51:01
问题 I'm using msysgit and have a project tree that contains many bin/ folders in the tree. Using the .gitignore file in the root of the project I need to ignore all .dll files that reside within a bin/ folder anywhere in the project tree. I've tried "bin/*.dll" but that doesn't work, I assume it is only working against the bin/ folder in the root of the project. 回答1: Just had a similar problem and realized: The files were already added and checked in to git. How to recognize the difference: Git

What happens when I clone a repository with symlinks on Windows?

∥☆過路亽.° 提交于 2019-11-27 01:06:27
There's been a lot of questions about adding support for symlinks on Windows. But, what actually happens when I clone a repository with symlinks on Windows? Since version 1.5.3 of the native Git client git clone and git init will probe the target file system for symlink support and set the local repository configuration for core.symlinks accordingly, i.e. to false for FAT or NTFS. This makes symlinks created and committed e.g. under Linux appear as plain text files that contain the link text under Windows (see the git config documentation on core.symlinks for details). Since Git for Windows

git: patch does not apply

不问归期 提交于 2019-11-26 23:15:44
I have a certain patch called my_pcc_branch.patch. When I try to apply it, I get following message: $ git apply --check my_pcc_branch.patch warning: src/main/java/.../AbstractedPanel.java has type 100644, expected 100755 error: patch failed: src/main/java/.../AbstractedPanel.java:13 error: src/main/java/.../AbstractedPanel.java: patch does not apply What does it mean? How can I fix this problem? Johannes Sixt from the msysgit@googlegroups.com mailing list suggested using following command line arguments: git apply --ignore-space-change --ignore-whitespace mychanges.patch This solved my problem

How to set Araxis as diff / merge tool for MSYS git?

落花浮王杯 提交于 2019-11-26 22:51:16
问题 I'm trying to use Araxis Merge as my diff / merge tool for MSYSGit. I found a few resources on the net: On the Araxis site, they mention an "easy" way, but it implies a executables (araxisgitdiff.exe and araxisgitmerge.exe) that are not part of my distro. I also found some info in gitguru, but the actual information re: Araxis is sparse at best, and I could not make anything out of that. Finally, there was some info on an older stackoverflow post, but the suggested method doesn't work for me.

MSysGit vs. Git for Windows

六月ゝ 毕业季﹏ 提交于 2019-11-26 22:19:25
问题 I am having trouble determining the difference between MSysGit and Git for Windows. How are they different? Why would I choose one over the other? 回答1: Are they not the same thing? On: http://msysgit.github.com/ The title is Git for Windows, the application is msysgit. Even in the event they are not, I expect the only differences will be in the method of compilation (i.e. compiler used and any options set) and any extraneous packaging (such as having a bash emulating shell as in msysgit). The

msysGit 中文环境配置及跨平台开发注意事项

泄露秘密 提交于 2019-11-26 20:32:03
注 :因从 Git V1.7.10 开始引入了 Unicode 支持,所以在此版本之前会出现的乱码问题可能在之后的版本则不需要设置,但仍存在 一些乱码问题 ,因此我仍然强烈推荐与 mintty 配合使用。 Git 是一个非常不错的分布式版本控制系统,虽然它最初设计在 Linux 平台下,但现在已经被很好的移植到其它平台。Windows 平台下对应的 Git 工具为 msysGit ,在涉及到跨语言开发时我们需要做一些配置来规避部分问题。但有些问题因为平台差异并不能够很好的解决,但只要在使用时留心这些差异,我们仍然可以让 msysGit 几乎完美的工作。 Git Bash 中不能输入中文 [解决方法] 在 "/etc/inputrc" 中添加或修改以下配置: set output - meta on set convert - meta off 中文 log 乱码 [解决方法] 在 "/etc/gitconfig" 中添加或修改以下配置: [ gui ] encoding = utf - 8 [ i18n ] commitEncoding = gbk logOutputEncoding = gbk 或在 Git Bash 中运行下列代码: git config -- system gui . encoding utf - 8 git config -- system i18n .

Msysgit中文乱码解决方法

自作多情 提交于 2019-11-26 20:31:44
msysgit-Git-version-previewdate.exe中文乱码解决方法 Git的Windows版本Msysgit对中文的支持不够好,当使用时,会出现以下情况的中文乱码: 1.ls不能显示中文目录 解决办法: 在git-completion.bash中增加一行: alias ls='ls --show-control-chars --color=auto' 2.git commit不能提交中文注释 解决办法: 修改inputrc中对应的行: set output-meta on set convert-meta off 3.git log无法显示中文注释 解决办法: 在profile中增加一行: export LESSCHARSET=iso8859 4.git status输出中文会显示为UNICODE编码 解决方法: 在gitconfig文件中修改或添加如下配置: [core] quotepath = false 参考文章: (1)http://www.cnblogs.com/phep/archive/2011/12/29/2306613.html (2)http://my.oschina.net/unclegeek/blog/53734 来源: oschina 链接: https://my.oschina.net/u/255789/blog/163659

use Winmerge inside of Git to file diff

跟風遠走 提交于 2019-11-26 19:19:29
Is there a way to use Winmerge inside of git to do Diffs? VonC Update June 2015, 6 years later: As detailed in " git mergetool winmerge ", a simple git config diff.tool winmerge will be enough. Git 2.5+ (Q2, 2015) is now aware of Winmerge as a diff or merge tool! Original answer (2009-2012) (msysgit, 1.6.5, DOS session) The first part (using winmerge) is described in " How do I view ‘git diff’ output with visual diff program? " C:\myGitRepo>git config --replace --global diff.tool winmerge C:\myGitRepo>git config --replace --global difftool.winmerge.cmd "winmerge.sh \"$LOCAL\" \"$REMOTE\"" C: