tortoisegit

TortoiseGit side-by-side with TortoiseSVN?

那年仲夏 提交于 2019-12-06 18:14:27
问题 I've been using TortoiseSVN for several years now, but am thinking of slowly changing to git, as I really like its branching and merging. I'm currently using git via the command line but am considering installing TortoiseGit. Has anyone had experience of using the two Tortoises side-by-side? Any known issues with this? I would really like not to screw up my SVN installation, as I will be using it for my existing projects. 回答1: I've been using it for a couple of months now. There are no issues

Graphic tool to display element tree branch in git for linux

你说的曾经没有我的故事 提交于 2019-12-06 16:35:15
问题 Having used clearcase lsvtree for many years I miss that functionality in git. Anybody know about a similar tool for linux? gitk is not as friendly for big trees and Tortoisegit looks cool but does not support linux. thank you 回答1: There is a project (that I haven't tested recently) to transform a gitk log into a version tree: crc8/GitVersionTree To go from: to: This is the closest I have seen from a ClearCase version tree. 来源: https://stackoverflow.com/questions/26680543/graphic-tool-to

Git Credential Management - allow to change passwords (Windows, TortoiseGit)

自作多情 提交于 2019-12-06 11:07:30
问题 We want to introduce Git to our company and decided to use TortoiseGit (as TortoiseSVN is already in use). We already noticed there are huge differences between TortoiseSVN and TortoiseGit in saving credentials. In short: To save credentials TortoiseGit uses Git for Windows and Git for Windows uses the chosen credential helper (eg. wincred). The credential helper saves the credentials in the credential manager of the windows control panel once and for all so you never have to enter your

Git账号以及TortoiseGit配置

故事扮演 提交于 2019-12-06 08:05:21
Http方式 这个没什么好说的,直接clone http的地址(git地址分为ssh地址和http地址),只是每次同步(pull和push)都需要输入账号密码 SSH 配置 1、设置Git的user name和email git config --global user.name "Sunny" git config --global user.email "sunny@woqugame.com" 2、生成密钥 ssh-keygen -t rsa -C "sunny@woqugame.com" 连续三个回车,会生成两个文件 id_rsa 和 id_rsa.pub 在~/.ssh目录下 Window默认在C:\Users\Administrator.ssh目录下 3、添加密钥到ssh-agent 为了确保 ssh-agent 是可用的。ssh-agent是一种控制用来保存公钥身份验证所使用的私钥的程序,其实ssh-agent就是一个密钥管理器,运行ssh-agent以后,使用ssh-add将私钥交给ssh-agent保管,其他程序需要身份验证的时候可以将验证申请交给ssh-agent来完成整个认证过程。 eval $(ssh-agent) 添加生成的 SSH key 到 ssh-agent。 ssh-add ~/.ssh/id_rsa 4、登陆Gitlab,将 id_rsa.pub

TortoiseGit - change default merge message

本秂侑毒 提交于 2019-12-06 07:25:58
System description: Windows 7 git version 2.10.1.windows.1 TortoiseGit 2.3.0.0 I want: The merge commit message to be different in a fully automated manner ( no manual amend ) Summary: On windows, using tortoiseGit, there is no prepare-commit-msg hook , only start-commit-hook and no matter what the hook script is, I get a windows popup error: %1 is not a valid Win32 application Also, I would prefer to only change the commit messages which are "merges". Steps: setup the hook: Set the working tree path to be same as my project's path, and in "Command Line To Execute" I select the file I prepared

How do pull no fast-forward in TortoiseGit

一个人想着一个人 提交于 2019-12-06 06:26:47
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. Where do you search for it? When selecting TortoiseGit -> Merge menu item I get dialog shown below. I can't believe that you missed "No Fast Forward" check box on it :) For pull there's no such option in TortoiseGit,

Git submodules using relative urls

南笙酒味 提交于 2019-12-05 21:39:33
问题 I use git (TortoiseGit 1.7.5.0) and have a repo with submodules, which are referenced via absolute paths in a manner: [submodule "common/sub"] path = common/sub url = ssh://localhost/lib/common/sub While the super-repo is cloned as ssh://user@localhost/super , the username shouldn't go into each submodule url, because different users should work with the code using their own credentials. When pulling/pushing submodules I had to enter my login (the password is not needed because I'm running

来讲讲Git这个玩意到底该怎么用?

空扰寡人 提交于 2019-12-05 19:40:57
目前最火的版本控制软件就是Git了吧?你要是还用SVN或者CVS什么的都不好意思在圈里打招呼!前天我就遇到这种情况了,QQ上和老同学聊起自己用SVN来管理程序版本,好麻烦,当场就惨遭鄙视---“你还用SVN啊?你Out了!我们都用Git了!”好吧为了不被人鄙视,也为了可以鄙视别人,我终于也开始学Git了! 用了几天之后的感觉就是,确实好用啊!难道大家都来追捧!linus继linux之后又造福了人类一把!就是这个东西因为模式和之前的版本控制软件略有不同,所以入门上稍许有点难度,好吧不废话了,讲讲自己的心得体会吧! 首先不得不讲一下,需要分清git和github这是两个不同的东西,类似于linux和redhat,前者是开源的项目,后者则是利用这个开源的项目提供服务的服务商。github是一个使用git来托管代码的网站,有两种托管方式,一种是公开的,任何人都可以下载和上传代码,另一种是私人的只有建立者制定的人才可以下载或上传代码,私人的只有交钱才能用。 国内类似github的服务现在也冒出来不少,我用的是git @OSC ,这个的好处是无论哪种代码都是免费的,当然以后会怎样就不清楚了,目前使用中发现github的速度明显不如git @OSC ,看来前者还是不接地气啊。 因为这两个比较有代表性,后面我的使用基本就以这两个为例了。 操作系统自然是windows

在win7系统下使用TortoiseGit(乌龟git)简单操作Git@OSC

╄→尐↘猪︶ㄣ 提交于 2019-12-05 19:40:43
非常感谢OSC提供了这么好的一个国内的免费的git托管平台。这里简单说下TortoiseGit操作的流程。很傻瓜了 首先你要准备两个软件,分别是 msysgit 和 tortoisegit ,乌龟还可以在下载页面下载简体中文语言包。 下载后分别安装好,如果不熟悉,可以使用默认设置。 接下来我们就开始搭建本地与Git@OSC的桥梁了。 首先将乌龟设置成中文,右键菜单TortoiseGit->settings->language选择中文 自己找到这个,打开后,点Generate 耐心等待(这个puttygen其实是按照鼠标运行的轨迹来计算的,点了generate之后鼠标乱画几下就ok了).......,出来下面的,从头开始复制到=,后面的rsa-key-xxxx不要复制 点击 save private key,将文件保存下来,是吧.ppk文件 这个页面不要关闭,说不定你忘记复制黏贴什么的 进入 https://gitee.com/profile/sshkeys**,添加公钥(粘贴你刚才复制的),保存** **创建一个项目,那个****添加.gitignore文件(官方建议创建该文件)不会的不要选,** 然后在项目首页,你会获取到如下信息 点后边的复制小按钮,等会就用到了 选择一个同步的项目目录,最好是空的,然后鼠标右键菜单“Git 在这里创建版本库”,不要勾选,直接点确定,就会出现一个

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

不问归期 提交于 2019-12-05 19:37:52
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 there a way to do the same in Git Extensions? I much prefer git extensions over TortoiseGit.. So I'd rather