tortoisegit

How do pull no fast-forward in TortoiseGit

由 早过忘川 提交于 2019-12-08 01:52:33
问题 Since some people recommend no fast-fordward (--no-ff) on merges in Git, I wanted to do that. But I can't see where to check to enable that in the TortoiseGit GUI. Yes, I could do this from the command line. But others in the group won't use it, so I need a GUI solution. EDIT: removed push from question; it is not realistic as pointed out below. The references were to pulls only. 回答1: Where do you search for it? When selecting TortoiseGit -> Merge menu item I get dialog shown below. I can't

Centos7搭建Git及安装使用

由 爱⌒轻易说出口 提交于 2019-12-07 16:00:35
Centos7搭建Git及安装使用 sa 发布于 2018-03-09 分类： 未分类 阅读(9139) 评论(0) 文章目录 [ 隐藏 ] 一、Centos7.2 下 Git的安装 1、查看是否安装了git 2、安装Git 3、创建Git仓库 二、windows7 下连接Git版本库 1、安装Git 和 TortoiseGit（小乌龟） 2、在本地创建文件夹 3、进入“six”文件夹，右击菜单设置本机用户名和email 4、Clone版本库（克隆） 5、添加文件 6、更新版本库 三、建立发布版本库 四、错误 小结 一、Centos7.2 下 Git的安装 1、查看是否安装了git rpm -qa|grep git 若已经安装，需要先卸载。卸载命令如下： rpm -e --nodeps git 或者 rpm -e git 2、安装Git yum install git 输入y,并回车 再使用 rpm -qa|grep git 来查看是否已经安装好了Git。 3、创建Git仓库 mkdir six_git // 创建文件夹 useradd six //创建用户名并设置密码 passwd six //(系统会提示输入密码和再次密码) groupadd git // 创建组 git init --bare //进入所创建的文件夹，初始化一个仓库 chown -R six:git /var

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

How do you update the GIT_SSH environment variable on Windows

由 烈酒焚心 提交于 2019-12-07 09:23:12
问题 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

git merge using the vs2012 diff tool

由 旧巷老猫 提交于 2019-12-07 06:09:17
问题 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. 回答1: 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

How to turn on git auto-fetch?

由 我只是一个虾纸丫 提交于 2019-12-07 04:37:47
问题 I have several git projects which I want to fetch everyday (in the morning for example) and checkout to the last commit (if there are no local changes of course) to the branch "origin/dev" (e.g. it may not be a master branch). So how to do this for all projects in the directory? 回答1: If you are using a *nix/mac you could use the following bash script and create a cron job/launchdaemon task: #!/usr/bin/env bash ls -d */ | while read folder; do if [ -d "$folder/.git" ]; then cd "$folder" git

tortoisegit settings->git->remote not showing

由 随声附和 提交于 2019-12-07 04:18:24
问题 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

tortoisegit clone option is unavailable in right-click context menu

由 南笙酒味 提交于 2019-12-07 02:50:28
问题 I have installed git 2.5.2 64-bit and TortoiseGit 1.8.16.0 64-bit onto my Windows 7 64 bit computer. I would like to clone a repository but when I right click in windows explorer, I am not seeing an option to clone a repo: I have gone to TortoiseGit -> Settings -> General -> Context Menu and made sure that the Clone option is checked: I am able to clone a repo using git: git clone user@location.com:Group/repo.git myrepo I can also get TortoiseGit's clone dialog to open via command line:

How to Reorder Commits (rebase) with TortoiseGit

由 此生再无相见时 提交于 2019-12-07 00:08:02
问题 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

TortoiseGit之配置密钥

由 痞子三分冷 提交于 2019-12-06 22:57:24
TortoiseGit 使用扩展名为ppk的密钥，而不是ssh-keygen生成的rsa密钥。使用命令ssh-keygen -C "邮箱地址" -t rsa产生的密钥在TortoiseGit中不能用。而基于 git 的开发必须要用到rsa密钥，因此需要用到TortoiseGit的putty key generator工具来生成既适用于git的rsa密钥也适用于TortoiseGit的ppk密钥，具体配置步骤如下： 1）运行 TortoiseGit 开始菜单中的puttygen程序，如下图示 2）点击“Generate”按钮，鼠标在上图的空白地方来回移动直到进度条完毕，就会自动生一个随机的key，如下图示 如有需要，可以为密钥设置对应的访问密码，就是修改上图中“Key passphrase”和“Confirm passphrase”的值。 3）将上图中多行文本框的内容全选、复制，并粘贴到git账户的 SSH public key 中，这就是适用于git的公钥。 4）点击上图中的“Save private key”按钮,将生成的key保存为适用于 TortoiseGit的私钥（扩展名为.ppk）。 5） 运行 TortoiseGit 开始菜单中的Pageant程序，程序启动后将自动停靠在任务栏中，图标显示为 ，双击该图标，弹出key管理列表，如下图示 6）点击上图中的“Add Key
订阅 tortoisegit