tortoisegit

TortoiseGit modified sign (icon overlay) is not updating

眉间皱痕 提交于 2019-12-02 17:14:05
I have made a small change in some code but TortoiseGit shows it as modified (red exclamation sign) although I have committed, pulled, pushed, but it stays. What should I do here? I have not seen this issue before. Andy I'm assuming you are using tortoise git? I've had the issue before, sometimes pressing F5 fixes it other times it just goes away after tortoise resyncs itself. Here is another possible fix link . The current workaround is to kill TGitCache.exe with the Windows task manager. neutcomp What helped for me was the following: Go to "Settings -> Icon Overlays" Check under "Status

Git error: “Please make sure you have the correct access rights and the repository exists”

☆樱花仙子☆ 提交于 2019-12-02 17:02:44
I am using TortoiseGit on Windows. When I am trying to Clone from the context menu of the standard Windows Explorer, I get this error: Please make sure you have the correct access rights and the repository exists More precisely, the snapshot of terminal is the following: git.exe clone --progress -v "git@arobotdev:\git\AlfaRobot.git" "C:\Work\AlfaRobot" Cloning into 'C:\Work\AlfaRobot'... Permission denied, please try again. Permission denied, please try again. Permission denied (publickey,password). fatal: Could not read from remote repository. Please make sure you have the correct access

How do I make to some of the files that I have changed is not offered in the commit?

拈花ヽ惹草 提交于 2019-12-02 16:41:14
I use TortoiseGit 1.8.3. I changed one of the files: Makefile, but I want to not offer commit it to me every once in a Git Commit. I added it to the "delete and add to ignore list", but it does not help. How do I make to some of the files that I have changed is not offered in the commit? I want, that Makefile was in remote repository as read-only, that I could edit it locally, and then TortoiseGit does not offer to me to commit it. That I wanted for Git-bash: https://www.kernel.org/pub/software/scm/git/docs/git-update-index.html Answer for TortoiseGit 1.8.15, Git 2.6.1. There is no need to

Can TortoiseMerge be used as a difftool with Windows Git Bash?

我只是一个虾纸丫 提交于 2019-12-02 16:08:38
I'm just starting to work with Git. I would like to use TortoiseMerge as the difftool and mergetool. In my .gtconfig in my personal user directory I have the following sections. I've removed the user and color sections for this question. [merge] tool = tortoisemerge [mergetool "tortoisemerge"] cmd = \"TortoiseMerge.exe\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\" [diff] tool = tortoisemerge [difftool "tortoisemerge"] cmd = \"TortoiseMerge.exe\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\" If I type tortoisemerge at the Git Bash prompt

TortoiseGit vs Git Extensions

蓝咒 提交于 2019-12-02 15:41:58
What are the benefits and disadvantage of using either Git Extensions or TortoiseGit on a Windows Based OS? Rafael Ibraim I don't know GitExtensions, but I can share my experience with TortoiseGit (alluded to by marc_s's comment): Pros: Excellent integration with Windows (it's a shell extension) Nearly the same UI as TortoiseSVN (if you already used TortoiseSVN, you know what to expect). Cons: You will have a hard time understanding how to use git. The problem with TortoiseGit is that people who worked with TortoiseSVN will think everything will (or should) work exactly like in SVN... and end

How do I remove msysgit's right click menu options?

房东的猫 提交于 2019-12-02 13:47:46
This isn't the best programming question but lets face it, the server fault guys aren't well versed in git, so I think its more towards this audience. I want to switch to TortoiseGit, or PortableGit in my shell, but I'm left with these annoying context-menu options. How do I get them to go away? Do I have to write a script to uninstall them? mpmeyer 64-Bit Windows From a cmd.exe window, run these commands: cd "C:\Program Files (x86)\Git\git-cheetah" regsvr32 /u git_shell_ext64.dll 32-Bit Windows From a cmd.exe window, run these commands cd "C:\Program Files\Git\git-cheetah" regsvr32 /u git

git did not exit cleanly (exit code 128) [duplicate]

久未见 提交于 2019-12-02 09:56:58
This question already has an answer here: How to resolve “git did not exit cleanly (exit code 128)” error on TortoiseGit? [closed] 14 answers i am getting this error. Tried all the solution from How to resolve "git did not exit cleanly (exit code 128)" error on TortoiseGit? I m using tortoise git & have git version 1.9.5.msysgit.1 I think 128 means the file is not found. Make sure TortoiseGit has been configured correctly to know which git.exe to run. Try opening Git Bash and running git there, you might get a better error message. I guess you did not configured your email and name. If not

TortoiseGit - Multiple GitHub repositories with different key pairs each

帅比萌擦擦* 提交于 2019-12-02 08:09:59
I have 3 GitHub repositories: {repo1, repo2, repo3}, each one with a different public key as Deploy key under each repository settings. On a remote Linux server (I connect to it via PuTTY from my local Windows 7 machine) I have all these repositories configured with the file: ~/.ssh/config following this guide: https://gist.github.com/jexchan/2351996 They works perfectly there, so don't worry about that. My problem is on my local computer, where I'm using Windows 7 with TortoiseGit . For each repository I have TortoiseGit configured like below: If I create a key pair for the repo1 and set it

What is the right way to commit/push when there are conflicts in Git or TortoiseGit?

久未见 提交于 2019-12-02 07:36:18
问题 We are using git and the merge workflow. We have lot of git newbies (including me) who either have an SVN or CVS background, or no version control background at all. Here is a frequent issue we are running into. Many of the team members were using TortoiseGit. Merge conflicts happened fairly often because of concurrent changes - or since they did not pull every day. One user would do a pull, have a merge conflict, resolve the merge conflict, and then look at the list of files to be committed