git-extensions

Is it possible to use Meld as a merge tool when using Git Extensions on Windows? Tomasz Maj In Git Extension: Settings -> Git Config Merge tool: meld Path to mergetool: C:/Program Files (x86)/Meld/Meld.exe Merge tool command: "C:/Program Files (x86)/Meld/Meld.exe" --diff "$BASE" "$LOCAL" "$REMOTE" --output "$MERGED" Yes it is, in response to this issue . Like Thomas, the accepted answer didn't quite work for me. The merged file was not saved after meld was closed. However, Thomas's answer didn't work for me either. While the file did save, it opened in Meld with the merged markup. Instead, I'm

Im trying to use git extensions and I really like it so far, but I don't manage to push to github. The following command works fine in git bash: git push "origin" master:master and then when I push with git extensions I get this: C:\Program Files\Git\bin\git.exe push "origin" master:master Permission denied (publickey). fatal: The remote end hung up unexpectedly Done In the git settings it just has openSSH selected which I would like to keep because putty seems more hassle. The remote addres I have added in gitextensions, actually the only thing I have done from the bash just to test is the

I am trying to set up version control software, currently I work alone (but I expect that to change), and I want to store the code on a network drive which is regularly backed up but work off the same code on my laptop's hard drive. But GIT is confusing me greatly! So from what I can understand, I should create a personal repository on my laptop, and then either push or clone this to a new central repository on the network drive. Does this sounds correct? Is this done by pushing or cloning? I'm using GIT-Extensions and they have this to say about central repositories: Central repositories only

I've been using Git Extensions for a while now (it's awesome!) but I haven't found a simple answer to the following: Sometimes, when typing a commit message, a make a typo. My friend showed me how to fix it the following way (in Git Extentions): Right-Click on the commit > Advanced > Fixup commit Then I simply check the box "Amend" and rewrite my message and voila! My commit message is fixed. However this other option "Squash commit"... I have always wondered what it does?! My question is: Would someone simply explain me what is the exact difference between Squash commit and Fixup commit in

I have repository on both github.com and bitbucket.org, and I am very familiar using Git Extensions for all repository functions... But when I started using bitbucket.org repositories I have to use TortoiseHg SVN for it ... so I want to ask that is there a way I can use Git Extensions for Bitbucket repositories? ryanttb I haven't fully tested it, but these steps allowed me to clone a Bitbucket repository in Git Extensions. You can use PuTTY to generate a public/private SSH key, then add that key to Bitbucket. Run GitExtensions\PuTTY\puttygen.exe Click Generate Click Save public key (as a text

I'm trying to use Git Extensions on a new Windows 7 machine. I have done that many times before but never hit this particular issue. Git Bash is working, I successfully cloned a repository. But going to Git Extensions, opening the repo, and doing a pull gives me the following error message: "C:\Program Files (x86)\Git\bin\git.exe" pull --progress "origin" error: cannot spawn git: Function not implemented Done Press Enter or Esc to close console... My setup is very ordinary. The Git Extensions startup checks all pass. (This is similar but not the same problem as the common invalid path issue.)

I tried to do a search for my issue and the closest thing that I could is this. git Status Shows Same File Twice - But with different path slash styles But it doesn't seem to be the same issue I have. I was doing a commit and noticed that the same file was listed twice but with different case. For instance, Directory/resource.h and Directory/Resource.h . Now there is only one file in the directory resource.h . If I look at the file through Git Extensions they look exactly the same. There doesn't seem to be another hidden file, there is only one file. So I tried to fix this by removing the