tortoisegit

TortoiseGit日常使用指南

痞子三分冷 提交于 2019-12-03 10:26:31
本文在介绍了软件安装和设置后, 写了TortoiseGit 常用的一些功能, 包括: 创建新库 添加文件及文件夹 创建分支 看分支情况及修改log 比较版本差异 合并分支 其他操作: Stash; 忽略文件 本文不包括: Git 服务器设置 Push 版本到服务器上 从其他机器上Pull 版本 解决中文字符问题 《Pro Git》和TortoiseGit 的帮助文档是两篇很不错的参考文档. 如果时间比 较紧, 可以看看TortoiseGit 的帮助文档, 对Git 的用法, 文件存储等都会有比较好 的了解. 对比常用的CVS, Git 至少有以下几个优点: 不需要连接服务器就能实现版本管理; 一个库不管有多少层目录, 只有一个管理目录 在commit 时, 可以将整个项目commit, 这样可以实现不需要添加Tag 就 保存整个版本信息. 在做Tag 时可以添加说明 2. 安装 (1) 安装msysgit 到http://code.google.com/p/msysgit/下载msysgit, 目前能下载到的最新版本是 Git-1.7.9-preview20120201.exe 安装过程中要注意, 在设置行结束转换时, 选择Checkout as-is, commit as-is, 这样Git 就不会修改换行风格了. 其他用缺省设置即可. (2) 安装TortoiseGit

Why doesn't tortoisemerge work as my mergetool?

我与影子孤独终老i 提交于 2019-12-03 09:28:38
问题 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? 回答1: According to this post, in version 1.8 TortoiseGit renamed tortoisemerge.exe to tortoisegitmerge.exe because the old version could not handle

TortoiseGit - change default merge message

匿名 (未验证) 提交于 2019-12-03 09:02:45
可以将文章内容翻译成中文,广告屏蔽插件可能会导致该功能失效(如失效,请关闭广告屏蔽插件后再试): 问题: 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

Git: Changes keep getting lost due to seemingly random merges

谁说我不能喝 提交于 2019-12-03 07:30:45
问题 I have a feeling this will be an obvious answer, but I can't seem to work it out. What appears to happen is that I commit/push some changes to the server and everything appears fine on my copy. Another developer then pulls from the server from the same branch (allegedly seeing my changes, as far as I'm aware), makes some modifications, commits them to their own local copy then finally pushes it back to the server. Somewhere in the middle of doing this my changes get lost as their push

TortoiseGit trouble: git did not exit cleanly (exit code 128)

こ雲淡風輕ζ 提交于 2019-12-03 06:44:18
Here is a little bit background: I run Win7 I have private git repo and installed Github for Windows I didn't like the Github for Windows client (lack capabilities). I installed TortoiseGit for Windows (still keep Github for Windows) I followed steps here exactly http://dancingmonkeysaccelerated.blogspot.com/2012/03/git-for-windows-with-tortoisegit-and.html I can get log and commit local Then I Push However it gave error git did not exit cleanly (exit code 128) I read this thread: How to resolve "git did not exit cleanly (exit code 128)" error on TortoiseGit? And actually changed SSH key by

How can I make a Pull request using TortoiseGit

元气小坏坏 提交于 2019-12-03 06:30:47
In TortoiseGit When I hit Right Click -> Push, OK, Give it User/Pass then after that there is a Create Pull request button giving it a Start, URL, End. I am clicking, but nothing happens. The Pull requests (0) is shown in my repo. And one other thing, How can I make a pull request and then update it as necessary using the same software (TortoiseGit) VonC The doc mentions : After pushing your changes to a (public) repository, you just provide other people the URL of your repository and the name of the branch or the revision id. E.g.: git://example.com/repo.git BRANCHNAME Start : This should be

Change repo url in TortoiseGit

£可爱£侵袭症+ 提交于 2019-12-03 05:32:00
问题 We just updated our git repos to a new location and I'm using TortoiseGit with some uncommited changes. Can I change the folder reference anywhere? I'm not seeing the option in the context menus. I'd rather not recreate and merge if avoidable since there are about 14 repos in total. I'm not well versed in git so please let me know if the question is flawed as well. 回答1: As far as i understand question. Path to change url of remote repository is: Right click on main folder TortoiseGit Settings

TortoiseGit, TortoiseBzr, TortoiseHg. Are any solid enough to switch from TortoiseSVN? [closed]

不羁的心 提交于 2019-12-03 04:50:23
问题 Closed . This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 2 years ago . I'd like to try out a distributed revision control system. I use a couple Windows PCs, a couple PCs with Linux, and a Mac. On windows, I'd like to use Tortoise. Are any of the Tortoises other than TortoiseSVN any good? Until recently, the knock against them has been that they

Can Git-svn be used on large, branched repositories?

安稳与你 提交于 2019-12-03 04:47:51
I am trying to use Git as a frontend to a SVN repository in order to be able to use Git's nice features like simple branching, stashing etc. The problem is that the SVN repository is quite large (8,000 revs) and contains lots of branches and tags (old as well as new). It's a near standard layout, with a config containing fetch, branches and tags directives. Since the oldest branch and tag refers to revision 10, it means that every svn fetch reads the entire repository history from revision 10 and forward, which can takes hours on the slow connection. If I only track trunk, then it's fine, but

Instructions on using TortoiseGit to interact with an SVN repository?

自作多情 提交于 2019-12-03 04:43:36
问题 I've been using TortoiseSVN on Windows for years with local filesystem repositories for my own projects. I'm planning to start collaborating with a friend on one of the projects, and will be shifting the repository to my own website. I've read a lot of "git beats SVN!" posts over the last couple years, and figured I ought to at least see what the fuss was about. Some research turned up the "git svn" command, and that TortoiseGit claims to have some level of git-svn support. I like the idea of