tortoisegit

TortoiseGit和intellij idea配置秘钥

时光怂恿深爱的人放手 提交于 2019-12-05 19:04:50
第一:intellij idea 配置gitlab ssh key 1:打开git bash,不需要进入任何目录,直接输入 ssh-keygen -t rsa 一路回车 2:生成之后找到秘钥文件id_rsa.pub 登录自己的gitlab账号 把自己的秘钥输入进去,完成之后就可以拉取代码了. 第二: 使用TortoiseGit,设置ssh方式连接git仓库 https://www.cnblogs.com/zy20160429/p/7493693.html (参考链接) 以下是生成ppk密钥,并且在TortoiseGit中设置的步骤: 1、开始程序菜单中,打开TortoiseGit,点击 PuTTYgen,在打开的窗口中点击Generate按钮,会出现绿色进度条,生成过程中可以多晃晃鼠标增加随机性。 2、生成之后复制生成的全部内容,窗口先留着不关闭。 把秘钥拷贝进来保存. 3返回到第二步的窗口,点击 Save private key 按钮保存为适用于TortoiseGit的私钥,扩展名为.ppk 4.运行TortoiseGit开始菜单中的Pageant程序,程序启动后将自动停靠在任务栏中,双击该图标,弹出key管理列表。 5、在弹出的key管理列表中,点击add key,将第4步中保存的私钥(.ppk)文件加进来,关闭对话框即可。 6、回到项目目录下,右键——TortoiseGit—

How do you update the GIT_SSH environment variable on Windows

痞子三分冷 提交于 2019-12-05 13:14:55
I'm using TortoiseGit, and I've just upgraded Git for Windows from an older version to 2.7.2. In the process, the location of ssh.exe has moved from C:\Program Files (x86)\Git\bin\ssh.exe to C:\Program Files\Git\usr\bin\ssh.exe . This has broken my ability to fetch changes in TortoiseGit, since it can't find ssh.exe at the original location. Looking at Show Environment Variables in the settings (Image 1), I get a generated file with the GIT_SSH environment variable set to the old path (Image 2). I have no idea where this is coming from. It doesn't appear to be part of Windows' environment

Git配置了秘钥认证后,tortoisegit仍需要认证的问题

余生颓废 提交于 2019-12-05 11:51:31
github和gitee都支持ssh秘钥配置,配置完毕后使用命令行就可以直接访问仓库而不用每次都输入密码,但是如果你安装了Tortoisegit的话,会发现配置的SSH对他无效。 这是因为TortosseGit默认使用putty格式的私钥,而git默认使用的是OpenSsh格式的私钥。 如果想使用同一ssh私钥,TortosseGit提供了这个功能,右键,打开TortosseGit的setting。将network中的ssh-client改为git目录下的ssh.exe即可 来源: oschina 链接: https://my.oschina.net/u/2745108/blog/3030683

tortoisegit settings->git->remote not showing

空扰寡人 提交于 2019-12-05 10:17:20
I want to use tortoisegit for windows7-64bit. I have already generated ssh-keys. I have read many tutorials instructing me how to "make the SSH key be known to TortoiseGit". Tutorials say that I should go to settings->git->remote, and fill some fields properly. The problem is that in my computer, the "remote" options does not show up. Assuming that was a bug of last version, I tried to install some previous versions (non-last-ones), and the problem remained. I am stuck. Can someone help me either to make the "remote" option to show, or to explain me how to make ssh key be known to tortoisegit.

git merge using the vs2012 diff tool

て烟熏妆下的殇ゞ 提交于 2019-12-05 08:38:44
Is it possible to use the diff tool in visual studio 2012 together with git? Using "devenv /diff fileA fileB" i can bring up a diff between two files, but how can i add a third (base file) as well, having 3 views side by side. Im currently using TortoiseGit and BeyondCompare. Git can be configured to use any generic diff tool, not only the one it knows out of the box. To call a generic diff tool, set the diff.tool configuration variable to a custom diff tool alias, say "vs2012", by typing git config --global diff.tool vs2012 and create a corresponding cmd variable for that diff tool alias by

How to Reorder Commits (rebase) with TortoiseGit

这一生的挚爱 提交于 2019-12-05 05:40:21
I want to push several single commits to our main git repository. After doing some reading though it sounds like I have to reorder the commits in order to do this, because git will only push all commits up to a specified commit. First, I don't really understand why this isn't just built in to git (I'm a git newbie). Regardless, I need to reorder the commits and I'm using TortoiseGit. I've found how to get to the rebase menu, but I don't know which options to choose. To get to the rebase menu I: Right clicked on the directory and chose TortoiseGit / Show Log Browsed to and selected the commit I

Fetch remote log, not the commits

允我心安 提交于 2019-12-05 03:29:20
How can I fetch the remote log without getting the changes/commits ? I only want to view the log, if there is any new changes since my last pull . Basically avoiding having to stash or commit my changes first. The git help files have this example, which in inverted form should give the result I want: git log master --not --remotes=*/master Shows all commits that are in local master but not in any remote repository master branches You have to fetch the changes, without merging them (i.e. don't use pull ): git fetch origin master After that you can use log (and other tools) to have a look at the

使用TortoiseGit在git@osc托管项目

左心房为你撑大大i 提交于 2019-12-05 03:21:06
一、环境 系统:win7 64位 TortoiseGit:TortoiseGit_1.8.9.0_x64 msysgit:msysGit-fullinstall-1.8.1.2-preview20130201 二、下载 链接: http://pan.baidu.com/s/1pJ0vJPx 密码: jdfa 链接: http://pan.baidu.com/s/1sjPulR3 密码: 9j2p 达一个比较工具免安装的,链接:http://pan.baidu.com/s/1ntMK8uH 密码:s3tk 三、安装 安装msysgit 安装 TortoiseGit 这里默认安装。 四、配置TortoiseGit 在你的要建的git目录下,右键TortoiseGit》settings,设置git路径 设置用户信息,右键TortioseGit》Settings》Git》Global 3. 生成ssh-rsa 密钥和公钥 a. 打开Puttygen, 开始》所有程序》TortoiseGit》Puttygen b. 设置密钥长度为1024,generate,鼠标需要在进度条上上下滑动 (已是一头黑线) c. 输入密码,保存公钥和密钥,先不要关闭界面 d. 登录git@osc,个人资料》SSH公钥》添加公钥 e. 将PuttyGen产生的public key 复制过来,确定 五、在git

TortoiseGit / Winforms: Resolving Resource.resx When Merging

心不动则不痛 提交于 2019-12-05 01:44:05
问题 I am fairly new to TortoiseGit. Wondering, if I get a conflict on a .resx file, how do I resolve it during a merge? For example, I could select "using theirs" off of the menu, try to do a pull and push, but is this the right approach? Can I somehow use theirs and rebuild it with my project changes? The differences (as well as mixed up contents compared to the respository) are many - to many to do a real merge. Thanks for looking? 回答1: This is an old question that has not been answered.

Git: hide/remove files never to be versioned

风流意气都作罢 提交于 2019-12-05 00:55:24
I'm trying to get started using Git and TortoiseGit. Is there a way to hide files that should never be tracked completely? Currently, all temporary build files are in the same "Not Versioned" list as new files when I commit a change. lemonad Create a text file called .gitignore in your root folder and add lines like the following to exclude files: *.obj test.c Then add .gitignore to your Git repository and commit: $ git add .gitignore $ git commit .gitignore You need to investigate .gitignore files. git help gitignore linquize TortoiseGit can add files to the ignore list with many options.