msysgit

How do I setup DiffMerge with msysgit / gitk?

拟墨画扇 提交于 2019-11-28 03:21:14
I've just started using Git and it's possible I've missed something obvious, but here goes: I'm using msysgit 1.6.2.2 on Windows XP While installing, I picked option 1 to "Use Git Bash only" I'm trying to put together a wrapper script that I can use to replace the built in git diff with DiffMerge. Based on this thread on SO, I created the following batch file: @echo off REM ---- Switch forward slashes to back slashes ---- set oldW=%2 set oldW=%oldW:/=\% set newW=%5 set newW=%newW:/=\% REM ---- Launch DiffMerge ---- "C:/Programs/SourceGear/DiffMerge/DiffMerge.exe" /title1="Old Version" %oldW%

Git error: fatal: unable to connect a socket (Invalid argument)

a 夏天 提交于 2019-11-28 03:19:38
I've got msysGit (Git on Windows) working just fine on my home machine, but at work, where we are behind a Microsoft ISA proxy, I get the following error when I do a git clone: H:\>git clone git://github.com/akitaonrails/vimfiles.git Initialized empty Git repository in H:/vimfiles/.git/ github.com[0: 65.74.177.129]: errno=Invalid argument fatal: unable to connect a socket (Invalid argument) I've tried setting the http_proxy environment variable to: http://our-proxy-server:8088 I've set the git http.proxy configuration directive: git config --global http.proxy http://our-proxy-server:8088

Why does git diff on Windows warn that the “terminal is not fully functional”?

亡梦爱人 提交于 2019-11-28 03:17:09
I'm using msysgit 1.7.7.1 on Windows. I get an error when using git diff . What is causing this? Is there no diff tool included in msysgit? What should I do? WARNING: terminal is not fully functional manojlds For Git Bash, this can be fixed by adding the following line to ~/.bashrc: export TERM=cygwin -or- export TERM=msys The first seems to be the original by git for windows, the second a popular known form to "heal" as well. The problem can be caused if some other program (like for example Strawberry Perl ) sets the TERM system environment variables. http://code.google.com/p/msysgit/issues

SSH Private Key Permissions using Git GUI or ssh-keygen are too open

五迷三道 提交于 2019-11-28 02:34:48
Recently I've been unable to clone or push to github, and I'm trying to find the root cause. This is on windows I have cygwin + git as well as msysgit. Msysgit was installed with the following options: OpenSSH Use Git from Windows Command Prompt That gives me 4 environments to try to use git in: Windows cmd prompt Powershell Git Bash Cygwin Somehow I've managed to get myself into a position where when I try to clone a repository using msysgit, cmd.exe, or Powershell, I get the following error: > Initialized empty Git repository in > C:/sandbox/SomeProject/.git/ > @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@

Syntax error =~ operator in msysgit bash

折月煮酒 提交于 2019-11-28 02:30:01
问题 I'm trying to add a function to my bash_profile for msysgit: function git-unpushed { brinfo=$(git branch -v | grep git-branch-name) if [[ $brinfo =~ ("[ahead "([[:digit:]]*)]) ]] then echo "(${BASH_REMATCH[2]})" fi } But I get the following error: bash: conditional binary operator expected` bash: syntax error near =~' From what I can find, the "equals tilde" operator ( =~ ) evaluates as regex in bash. Why is =~ is throwing an error? UPDATE: Here's a screenshot of inputting it manually (this

Hudson Git Plugin not working on windows

☆樱花仙子☆ 提交于 2019-11-28 01:03:47
I have msysgit installed with OpenSSH option. In Git bash, I can run ssh-agent, and it manages the passphrase for my ssh key. Is it possible for the Hudson Git plugin to use ssh-agent? Currently, it hangs when trying to clone, no doubt waiting for the passphrase to be entered. Thanks! VonC As mentioned in "Problem with Hudson + Git + Gitosis on windows" , you need to make sure the Hudson job does set first a %HOME% environment variable. That value must refer to the directory where you can find: .ssh id_rsa # private key id_rsa.pub # public key I've just had this exact same problem but in my

Can I use mSysGit and Cygwin's git?

試著忘記壹切 提交于 2019-11-27 22:26:58
问题 After migrating to Windows, I'm using msysgit with its included bash shell, and that's working well for me. But I have issues: our ant build process won't run in that shell, I'd like to use Cygwin's xterms instead of the Windows command window, since the terminal compatibility isn't good enough to run everything else I'd like in that window, and so on. I've actually made a go of sticking with msysgit in the Windows command shell so that I don't have to use a separate window to build, but that

How do I run msysgit in cmder?

时间秒杀一切 提交于 2019-11-27 20:44:14
问题 I was using msysgit and git-bash in cmder when I accidentally exited out of it. Now I can't seem to figure out how to get to the unix environment I previously had. Git bash is not recognized as a command. All I see is the typical command window prompt displaying the C:/User/.. rather than the $~User . How would you restore the git bash session? 回答1: You can type the full path of your msysgit intallation (2014, Git 1.9.z) to launch a bash session. For instance: "c:\prgs\git\PortableGit-1.9.0

Configure Git to use Plink

核能气质少年 提交于 2019-11-27 19:56:06
问题 I'm trying to configure Git to use Plink. It worked for me many times before. Now, for some reason, this option isn't available to me (it is disabled): I tried uninstalling and reinstalling Git a hundred times. Nothing. I can't get to this option enabled. 回答1: This is an old question, and I just have the same problem, just to be sure I will write down the solution that worked for me. The msysgit installer didn't show the screen that allows to select between the openssh client and the Tortoise

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

守給你的承諾、 提交于 2019-11-27 19:51:43
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. That particular info was geared towards OS X. I "translated" to Windows as best as I could, but