msysgit

Has anyone ever made Meld work with Git on Windows? I am trying to make it work and I have no success. I have Meld installed and when I call it from the command line with two files as parameters it diffs them well so Meld is installed correctly. However I can't make it work with Git (Git Diff). I use version git version 1.8.1.msysgit.1 of Git. I have tried several things: I created a shell script, meld.sh : #!/bin/bash meld.exe "$2" "$5" echo $2 echo $5 and used it from Git: [diff] tool = meld [difftool "meld"] cmd = \"D:\\meld.sh\" I tried to add it as a difftool like this: [diff] tool = meld

I'm using Git on Windows, installed through GitExtensions with MSysGit (latest) having selected "do not modify my Windows prompt" during installation. Now, I would like to be able to modify the default prompt (which by default shows just the branch name to also show me how much time, and how many local commits since I last pushed to origin (or specifically origin/master , whichever is easier). So say instead of: me@myPC /c/myRepo (master) I would see something along the lines of: me@myPC /c/myRepo (master) 5 | 10:20 meaning I have last pushed 10h 20min ago and I have made 5 local commits since

I managed to create a little mess in my local git repository. I was trying to fix a broken commit by using the following instructions . Before running the "git commit --amend" (and after the git rebase --interactive) I decided that my changes were incorrect and so I executed "git reset HEAD --hard". Not a good idea, I tell you. Now the interactive rebase seems to be "stuck". Git shows the current branch as (|REBASE-m). Every command (cd .., ls, git rebase...) inside my repository gives the following error: cat: .git/rebase-merge/head-name: No such file or directory Here's how git rebase -

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. 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 (plink) The solution is to install Putty (or Tortoise Plink I guess), create and save at least one session,

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 running cmd from the start menu) git related commands also take forever, even just to run. For example git

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. Just had a similar problem and realized: The files were already added and checked in to git. How to recognize the difference: Git didn't show the files as "new", but as "modified". This details has cost me quite some time... If that is the

Is there a simple way to export / archive only the changed files from a given commit or series of commits in git? I can't seem to find clear instructions to do this (and I'm new to Linux/Git). I am using msysgit, and for the most part I'm fine with deploying entire repositories but in many cases it is much more efficient to deploy small fixes a few files at a time. Pushing/pulling/installing git on the remote servers isn't really an option as my level of access varies between projects and clients. Is there a straight-forward way to (rough guess): pipe 'diff --names-only' to 'git-archive'? I