Tortoisegit updating to revision dating strona milosc
I expect a fast commit and instead am seeing " Preparing commit..." dialog with " Updating index" and taking > 20 minutes as it seemingly runs through every file in the repo.
This seem to have just started after updating to tortoisegit 126.96.36.199 git version 188.8.131.52.1367.gcd48 running on xp sp3 Please provide any additional information below.
Create a new revision on that branch with an updated submodlue cd submodule/ git checkout submod_second cd .. On master create a conflict with the file change (nothing to do with the submodule) git checkout master \#bring the submodule back to the revision it should be in master git submodule update \#create a conflict with the file only echo oldfile > git commit -am "updating file" 4.
Attempt a rebase from local_second git checkout local_second git submodule update \#At this point, we are on the local_second branch with no local changes (submodule and files are up to date) \#TGIT: show log \#TGIT: change branch in log window to master \#TGIT: right click the 'master' label and click on 'rebase "local_second" on to this' \#TGIT: click start rebase What is the expected output? Once the rebase has started, a conflict will show in file.txt, but the submodule will show as modified as well.
Create a submodule repository and fill it with some content git init submodule cd submodule/ echo "hi" >> git add git commit -am "adding content" \#create a second branch with different content. git init local cd local/ git submodule add -b master ../submodule git commit -am "adding submodule" echo "file.txt" > git add git commit -m "adding file" REPRODUCTION STEPS 1.
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?
Sign up for free See pricing for teams and enterprises Tortoise Git provides a GUI extension for Git, within Windows, and installs itself within the Windows File Explorer.
This allows Windows File Explorer to access a Git repository.
Just like with Tower, our mission with this platform is to help people become better professionals.
That's why we provide our guides, videos, and cheat sheets (about version control with Git and lots of other topics) for free.