I've tried msysGit and Git on Cygwin. Both work just fine in and of themselves and both run gitk and git-gui perfectly. Now how the heck do I configure a mergetool? (Vimdiff works on Cygwin, but preferrably I would like something a little more user-friendly for some of our more... Windows-loving coworkers.) Thanks! ...
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 argume...
This is related to another question I asked recently. When installing msysgit, the installer presents 3 options related to system path: Never change windows environment. With this option, you have to use the "bash" shell to work with git. Add the git\bin directory to the PATH environment variable, but without overriding some builtin w...
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 wi...
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 create...
I plan to migrate my projects over to git, and I'm currently wondering which is the best and / or most stable option under windows. From what I gather I basically have 2.5 options: MSYSgit git under Cygwin (aka 2.5) MSYSgit from a Cygwin prompt (given that Cygwin git is already installed). Note: IMO Cygwin in itself is a big plus as...
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 spar...
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 t...
I'm using msys-git and notice I often get strange characters in the output after doing a git pull. I presume these are some sort of control characters that some terminals might understand but in a standard windows command prompt they result in this: Source/MidiLib/AudioChannelMixer.cpp ←[m | 6 ←[32m+←[m Source/MidiLib/AudioEn...
I have a windows 2003 box with an ssh server setup. I have msysgit (git version 1.6.2) installed both locally and on the server. The server has the following absolute path to my repos: e:\vc\git\myrepo.git when a user logs in he/she will be put in the following working directory: e:\vc\git\ When running the following cmd on my de...
hi all i am having a problem with deploying my application to my server. i have msysgit, github and capistrano installed and working. i have successfully pushed my app to github and can successfully run cap deploy:setup to setup on my server from my local machine. BUT.. when i run cap deploy:cold it asks me for my passphrase to conn...
In my development environment at home I want to install msysgit im my local machine and in a server that I have. The goal is to develop in my local machine and then pushing it to the server (remote repository), for the nightly builds. Unfortunately, I can't seem to config the server's msysgit installation to be a remote repository. How...
I'm trying to run git for my local repository and use SVN for my central repository to a CodePlex project. I downloaded the most recent version of msysgit, but the SVN support doesn't appear to be working. The following successfully initializes a new empty repository and then gets stuck: git svn init https://myproject.svn.codeplex.com ...
I am using msysgit on windows vista. I am still very new to it and on my first committed code to github another member said that all the tabs were replaced with spaces. Could it be possible that msysgit is changing this? I am editing the files in VS2008. Is is just come c sharp .cs files. ...
I am installing msysgit 1.6.4 beta on my Win Vista development VPC. An install screen is requesting whether I want to use Unix line termination or DOS line termination. Ordinarily, I'd choose DOS, but the setup text indicates that DOS termination may mean files do not work with all of Git's command line tools. The Unix line terminatio...
I want to keep in sync a couple of internal projects between 3 Windows-based notebooks using msysgit. No external repository is desired. In the best case, every time two developers meets, they should be able to sync their projects. The only setup I could figure out would be an IIS/Apache web server on each notebook, so one developer wo...
Using the MSYSGIT history browser, I checked-out a particular commit. This was a mistake - I was trying to view the files and thought I had to check them out to see them. Since then, I have been unable to push any more commits to my remote repo (on GITHub). Which I somewhat understand, though not entirely. [I admit to not fully underst...
I'm trying to import a large subversion repository into git using git-svn (so that I can work in git but still dcommit to subversion from time to time). After importing more than 4000 revisions I'm now getting the following error whenever I run git svn fetch or git svn rebase, which I don't manage to get rid of: $ git svn fetch error: i...
I'm using TortoiseGit with msysGit installed with the msysGit-fullinstall-1.6.4-preview20090729.exe and it works in a very strange way: on the About windows it says it can't find git, even if all the operations seems to complete ok on the Settings window, General tab, MSysGit section, the version is blank even with the correct path set...
I'm running Ubuntu on VM and MsysGit on Vista. I'm using Github as the git host and tracking the same repository from Msysgit too. When I pull all the changes from Mysysgit and do the "git status", it lists the uncommitted changes. But when running "git status" from the Ubunutu, its all clean. No uncommitted changes. Why is this happen...