git-extensions

What's the difference between “squash” and “fixup” in Git/Git Extension?

[亡魂溺海] 提交于 2019-12-18 10:11:27
问题 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:

Git bash home directory different from Git extension than Git Bash

空扰寡人 提交于 2019-12-17 18:35:33
问题 If i run Git bash from Git Extention ( CTRL + G ), my home directory is %USERPROFILE%, which is ok. If I run Git bash from the context menu of a git repo folder, or if I run Git bash from the start menu, my home directory is %HOME%, which is different. How can I set up git bash to always use %USERPROFILE% as home directory (I have the .ssh folder within) ? If it can help, on git bash run from Git Ext, I have : $ echo $HOME /c/Users/mylogin Same command on git bash run directly : $ echo $HOME

How to use Winmerge with Git Extensions?

≯℡__Kan透↙ 提交于 2019-12-17 17:25:13
问题 I'm using Git Extensions and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I'm very fond of Winmerge though and would like to replace KDiff with Winmerge. In the Git Extensions settings, there are settings to change the Mergetool, but I can't seem to figure out what syntax I should use and why. There seem to be 4 variables: $BASE, $LOCAL, $REMOTE, $MERGED. It seems that I should pass these to WinMergeU.exe, but with which command line parameters? I've tried to

Can I force Visual Studio (2010) to do a “Save All” when I build my solution?

心不动则不痛 提交于 2019-12-12 15:36:14
问题 I have a recurring frustration with Visual Studio 2010. I'll add a new file to a project, build, run tests - all good. Then I'll commit and push my changes (I'm using GitExtensions and GitHub) Finally, I'll exit Visual Studio - and get asked if I want to save changes to MyProject.csproj. Sure enough, after saving changes, the .csproj file now shows local modifications in GitExtensions - which means the previous commit/push actually pushed broken code, because I'd pushed the new file without

block specific file for some users in Git repository

左心房为你撑大大i 提交于 2019-12-11 19:24:54
问题 I have a problem, there is a css style file, this file should not be modified by anyone from the development team, only the administrator (me) :) There any way to lock the file. I have seen in the commits, that the file has been changed, but I do not want this to happen. What I can do? I use gitblit server, and git with git-extensions. thank you very much for your answers. 回答1: This must be done on the server, by setup a hook within Gitblit. Check one of the provided post-receive hooks. A

unable to clone git repository on laptop, however, cloned successfully on dev machine

爷,独闯天下 提交于 2019-12-10 15:45:38
问题 I have successfully installed git on a windows server 2008 machine and set up ssh. I have successfully cloned a repository on my developer machine (windows 7), but when I tried to clone it on my laptop (windows 7), it is giving me the error: unable to open connection. Host does not exist I can connect to it with putty successfully, and also set the environment variable. I cannot identify what I am missing. Please help. Thanks in advance. 回答1: Actually when I tried to clone it was also giving

Does Git Extensions keep a log of commands and their results?

谁说胖子不能爱 提交于 2019-12-10 14:45:12
问题 When you run a command in Git Extensions, it pops up a window and shows you the git command line that it invokes along with the resulting output. This is handy but sometimes I close the window before I realize that I wanted to look at the details of the output. Does Git Extensions log this output anywhere by default or can it be configured to? 回答1: Looks like there is no such functionality. You can see the commands issued by Git Extensions from `Help-Gitcommand log'. I guess storing the

GIT extensions does not connect to remote but git bash does

女生的网名这么多〃 提交于 2019-12-10 11:03:42
问题 I actually connect to a remote repository and can do so using git bash but not using gitextensions. git bash asks me for my password but GIT extensions does not. Does anyone have an idea why this will be the case? This is from GIT bash, which asks for my password whereas the GIT extensions does not ask for my password. $ git pull http://vkaul@stash.int.linz.jumio.com/git/OCR/ocr.git Password for 'http://vkaul@stash.int.linz.jumio.com': 回答1: Try this: Open the Git Extensions main window Go to

Git commit signing GPG issue

痴心易碎 提交于 2019-12-08 01:08:11
问题 I am having the following issue when I am trying to create a commit using Git Extensions and SourceTree "C:\Program Files\Git\bin\git.exe" commit -F "C:\Code\XXX\.git\COMMITMESSAGE" gpg: keyblock resource 'C:/Code/XXX/%appdata%/gnupg/pubring.kbx': No such file or directory gpg: skipped "ZZZZZZZZZZ": No secret key gpg: signing failed: No secret key error: gpg failed to sign the data fatal: failed to write commit object Done My pubring.kbx exists in my %appdata% directory but why is it

Is it possible to set diff/merge-tool for a specific file extension in git-extensions?

无人久伴 提交于 2019-12-07 11:08:47
问题 I'm just getting started on developing in LabView, it's all new to me. And i'd like to use git extensions to handle my versioning. Since the source is in a *.vi format, I can't use the normal diff tools, the source is binary. Fortunately, LabView comes with dedicated diff and merge tools which seems to be very helpful. And I can setup TortoiseGit to use these tools on all *.vi files. It's from this how-to: https://www.labviewhacker.com/doku.php?id=learn:software:github:getting_started Is