I have been experimenting with using Mercurial and TortoiseHG to track my work when I am working remotely (with a slow VPN I don't want to commit to SVN unless I have something that works). I have found TortoiseHG a bit hard to use - or at least it often doesn't work the way I expect it to, so I am considering switching to GIT and Tortoi...
I'm new to Git, so I suspect that I'm misunderstanding something here, but I'll ask anyway. Via TortoiseGit I do the following: Init a new Git repo locally Add a readme file to it and commit Add a new remote Push the new repo to the orgin (remote) If I then Browse Refs I see the following: heads/master remotes/origin/master What I ...
Anyone install both? Using each for separate projects obviously. Shouldn't be a problem, I'm guessing, but hoping to fish out any gotchas. Furthermore, anyone use Tortoise Git, Subversion and Mercurial on the same machine? Edit: Forgot to mention, this is for Windows 7. ...
I have two branches with several commits each. On one branch, I can go to the log, select two commits, and TortoiseGit shows "combine to one commit" in the context menu. On the other branch this option does not show in the context menu. Both sequence of commits is very similar; add file then modify it, so there is no difference really be...
This is a little hard to explain with text, but I'll do my best, and you try to keep up; if something isn't clear at first, don't hesitate to ask, and I'll try to clarify. When TortoiseGit has one branch it looks approximately like this: o | o <-- a commit sign | x When I split my work into a new branch, it looks like this: o | o-...
Using TortoiseGit (I'm trying to avoid command line usage) how does one delete all commits that accended from a certain commit, and "get back in the past" (example usage: continued doing something, figured I didn't like where it was going, and decided to go "back" disregarding all in between). In short I wish to go 5 commits "back", and...
I've been using SVN through tortoise and svn:// protocol on windows for a couple of years and I'm pretty comfortable with it. Nevertheless there are a couple of features I'd like to hove, mainly shelves (something like local commits) and easier branch / merge support. From my experience, svn / tortoise on windows is rock solid stuff. ...
I followed these instruction and could not connect to github for the life of me. >plink -ssh github.com FATAL ERROR: Disconnected: No supported authentication methods available plink -ssh [email protected] You've successfully authenticated, but GitHub does not with tortoisegit git.exe push "origin" master ERROR: Permission to name...
Greg's comment help me understand http://stackoverflow.com/questions/1698552/tortoisegit-push-successfully-but-no-new-files/1698657#1698657 How do i create a local bare repository with tortoisegit? I can right click and clone a repository from github and push. I would like to create a local repository then do the same thing, clone and ...
Hi all! I am very new to Git and I have a slight problem. In SVN [this feels like an Only Fools and Horses story by uncle Albert.."during the war..."] when I wanted to update a production site with my latest changes, I'd do a diff in TSVN and export all the changed/added files between two revisions. As you can imagine, it was easy to g...
I'm trying to figure out what's going on with my local Git repo. I edit a file. Git reports everything has changed in the file (I only changed one line) At first I think "must be a newline problem", but it's not. I do a diff in TortoiseGit, everything looks fine. I do a diff with Netbeans (git plugin), everything seems fine. I do a res...
When installing TortoiseHg on Windows x64, I have an option to install both x86 and x64 shell extensions, which is useful, as my favorite Windows Explorer replacement is 32-bit. But there is no such options for TortoiseGit or TortoiseSVN, so working with them requires opening Explorer windows. I know it's possible to install 32 and 64-b...
How do you export a GIT file map so you just keep the local files without GIT files? The tortoiseGIT export keeps some GIT files hanging around (and only does a zip export), and the 'delete (keep local)' option isn't helping either it seems. ...
Have this currently problem with TorotiseGit - Show Log taking ages to populate with the history. We have a repository with 300,000 files and recently about 3000 revisions ago, the administrator did a SVN move of one of the main directory's. Yes this means all 250,000 files where moved from one directory to the next. The biggest prob...
I am new to Git. I installed msysgit, configured ssh and pulled a solution from GitHub (my own solution, I pushed it from a different computer). The pull worked. Now, I installed tortoisegit to make life easier. It displays the correct items in Windows Explorer. I would expect a "pull" and push entries in the context menus, but I can'...
I am developing in the 'master' branch and want to copy some files from 'feature-1'. How can I do that with TortoiseGit? (I am not interested in command-line solutions.) ...
If I have a network drive with a git repo checkout, for example, samba drive on a windows machine (A) connected to Linux machine (B) where the local checkout is. Is there a way for clients on A - who can see the drive - to do git operations through the the ssh access defined on B? ...
I've just started using Git and find that whilst I am implementing a feature in a branch, I will encounter some bug that really needs to be pushed to the trunk as soon as possible. In order to do so, I use checkout to switch back to the trunk, make my changes and commit them. I now have a trunk that is bug free. Unfortunately, my branch...
I have recently installed Cygwin along with the Git binaries and a copy of Tortoise Git on a fresh Windows XP install. I seem to be able to do most Git operations through Tortoise such as viewing the logs etc, but when I come to commit via Tortoise I get this message... error: unable to create temporary sha1 filename : No such file...
Most git tutorials use command line which is fine but I'm looking for resources specifically showing workflows in TortoiseGit (note the emphasis on workflows, not just installation and basic checkouts / commits). Any links / suggestions? ...