tortoisegit

Deleted remote branches still listed in TortoiseGit

烂漫一生 提交于 2019-12-03 04:30:48
I have noticed TortoiseGit seems to contain every feature branch I ever created, both in drop-downs for local branches AND remote, even though many of the remote branches were deleted after being merged into master. Is there a way in TortoiseGit to synhronise which branches are listed to those actually existing? And a slight tangent... in terms of Git itself is a local version of a branch considered totally decoupled from the remote? i.e. there is no reason why deleting the remote version should automatically mean the local one is deleted? VonC You can do, as mentioned in issue 1139 , a Fetch

How do I make to some of the files that I have changed is not offered in the commit?

折月煮酒 提交于 2019-12-03 03:10:23
问题 I use TortoiseGit 1.8.3. I changed one of the files: Makefile, but I want to not offer commit it to me every once in a Git Commit. I added it to the "delete and add to ignore list", but it does not help. How do I make to some of the files that I have changed is not offered in the commit? I want, that Makefile was in remote repository as read-only, that I could edit it locally, and then TortoiseGit does not offer to me to commit it. That I wanted for Git-bash: https://www.kernel.org/pub

Can TortoiseMerge be used as a difftool with Windows Git Bash?

前提是你 提交于 2019-12-03 02:36:34
问题 I'm just starting to work with Git. I would like to use TortoiseMerge as the difftool and mergetool. In my .gtconfig in my personal user directory I have the following sections. I've removed the user and color sections for this question. [merge] tool = tortoisemerge [mergetool "tortoisemerge"] cmd = \"TortoiseMerge.exe\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\" [diff] tool = tortoisemerge [difftool "tortoisemerge"] cmd = \"TortoiseMerge.exe\" -base:\"$BASE\"

TortoiseGit save user authentication / credentials

匿名 (未验证) 提交于 2019-12-03 02:26:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Is there a way to save GITHUB's user credentials with TortoiseGit? It prompts me the below dialog every time whenever I do a push/pull. I would like to save my user credential information somewhere like how I did with TortoiseSVN. 回答1: For TortoiseGit 1.8.1.2 or later, there is a GUI to switch on/off credential helper. It supports git-credential-wincred and git-credential-winstore . TortoiseGit 1.8.16 add support for git-credential-manager (Git Credential Manager, the successor of git-credential-winstore ) For the first time you sync you are

TortoiseGit with openssh key not authenticating using ssh-agent

匿名 (未验证) 提交于 2019-12-03 02:24:01
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: I'm setting up a git environment on Windows XP (msysGit 1.7.11, TortoiseGit 1.7.14) and trying to achieve following points : ssh connection on a port different than default 22 ssh authentification handled by ssh-agent So I create a ~/.ssh/config file : Host gitbox User gitolite Hostname XX.XX.XX.XX Port 154 PreferredAuthentications publickey IdentityFile "/c/Documents and Settings/kraymer/.ssh/id_rsa" When using the git bash CLI, everything works as intended. I'm struggling with TortoiseGit. I first installed TortoiseGit with Plink and using

Tortoisegit fatal:Authentication failed for认证失败问题解决办法

微笑、不失礼 提交于 2019-12-03 02:04:10
问题描述 在Win10中使用Tortoisegit提交代码时出现fatal:Authentication failed for认证失败问题,截图如下: 这种情况一般是Git账号密码错误。 网上解决方案 查了下网上相关资料,基本都是说重新设置用户信息,就可以正常了。 比如重置右键密码; 或者 git remote -v git remote remove origin git remote add origin xxx 或者 git config -–global user.name "xxx" git config –-global user.email "xxx@xxx.com" 个人解决方法 但是,个人试了以上方法都没解决问题。最后,找到了网上一篇 “fatal: Authentication failed for码云的解决办法” 的文章。按照上面的方法 解决方法如下: git config --system --unset credential.helper 然后就终于可以重新填写用户名和密码进行提交了。 来源: oschina 链接: https://my.oschina.net/u/1784946/blog/2991868

Unable to check diffs with TortoiseGit: “fatal: empty string is not a valid pathspec”

匿名 (未验证) 提交于 2019-12-03 01:10:02
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: Currently, I did a re-installation of my windows 10. I also installed Git and TortoiseGit. Right now when I try to check diffs I have theses two errors in a window: fatal: empty string is not a valid pathspec, please use . instead if you meant to match all paths I click ok, then the other window error is: Failed to get UnRev file list fatal: empty string is not a valid pathspec, please use . instead if you meant to match all paths I click ok and it does not show me any errors in the "working tree" diffs. Git.exe is in : C:\Program Files\Git

Why doesn't tortoisemerge work as my mergetool?

寵の児 提交于 2019-12-03 01:08:53
I have TortoiseGit installed, and in the past it's used tortoisemerge as my mergetool seamlessly. But since I upgraded TortoiseGit to 1.8.x, my mergetool is no longer working: c:\Code\whatever> git mergetool merge tool candidates: tortoisemerge emerge vimdiff No known merge resolution program available. This used to work, so why is it broken now? According to this post , in version 1.8 TortoiseGit renamed tortoisemerge.exe to tortoisegitmerge.exe because the old version could not handle spaces in file names so well. According to this blog post , you'll need to enter the following commands: git

git使用Tortoisegit教程

匿名 (未验证) 提交于 2019-12-03 00:22:01
1.安装Tortoisegit和汉化插件 2.右键 保存贮藏, 3.在项目文件夹上右键pull拉取 4. 弹出贮藏并解决冲突 5.编辑冲突 6.左侧是自己的,右侧是从远程拉取下来的。 7.保存修改,并标记为已解决,解决完所有冲突提交 文章来源: git使用Tortoisegit教程

TortoiseGit的安装与配置

匿名 (未验证) 提交于 2019-12-03 00:11:01
1. 简介   TortoiseGit是Tortoise提供的Git版本可视化工具,简化Git记忆命令行的过程,将命令行可视化。 2. 下载   官网: https://tortoisegit.org/download/      根据Git的版本下载对应位数的TortoiseGit。      下面是语言包,选择合适的位数下载简体中文汉化包。(100%汉化好评) 3. 安装与配置   (1) 先安装本体TortoiseGit-X.X.X.X-XXbit。Next。      (2) 选择SSH客户端。     1) Tortoise提供的,基于PuTTY。     2) OpenSSH,Git的默认客户端。一般选这个。      (3) 选择安装的功能和安装目录,点Browse修改安装路径。      (4) Install 确认安装。      (5) 勾选 "Run first start wizard" ,点击Finish进行初次运行配置。Donate是捐助。      (6) 选择语言栏,默认只有英语。安装简体中文语言包:TortoiseGit-LanguagePack-X.X.X.X-XXbit-zh_CN。      (7) 勾选 "Configure TortoiseGit to use this language" 点完成。      (8)