Tortoisegit updating to revision
Once the rebase has started, a conflict will show in file.txt, but the submodule will show as modified as well.Even though it is noticed, there is no way to continue this rebase without taking the submodule update also.However, there is also a "safer" way in case you'd prefer leaving your current HEAD branch untouched.Since "branches" are so cheap and easy in Git, we can easily create a new branch which starts at that old revision: want it to start at the current HEAD revision, you also need to provide a commit hash - the old project revision we want to restore.Tortoise Git commands are accessed using the file explorer's popup window.This provides a graphical view of a GIT repository.This view is of particular importance when multiple repositories for the same project are viewed, because it shows the relationship between the various branches from various developers.All connected branches are shown in a PALE BROWN colour. The working repository (where the actual files can be seen on the local machine) will be highlighted in RED.
If you're sure that this is what you want, everything is fine.What version of Tortoise Git and msysgit are you using? TGit: 22.214.171.124 msysgit: 1.8.0.msysgit.0 OS: Win 7 x64 Please provide any additional information below.I have uploaded a setup script to prepare the repo to demonstrate this. on February 05, 2013 (imported from Google Code)* --- What steps will reproduce the problem?SETUP STEPS (creating repositories to reproduce the issue.txt does all of the command line steps below up until the #TGIT comments) 1.
Search for tortoisegit updating to revision:
The reset command comes with a couple of options, one of the more interesting ones being the "--soft" flag.