This is probably a case of the following reported bug in VS Code 1.76.1: Git decorations not shown in 1.76.1 #176749. That issue ticket got closed in favour of Git gutter not shown in workspace with multiple folders #176738, where the issue has been purportedly fixed for the latest insiders version of VS Code. You … Read more
You can review the differences with a: git log HEAD..origin/main # old repositories git log HEAD..origin/main before pulling it (fetch + merge) (see also “How do you get git to always pull from a specific branch?”) Note: since Git 2.28 (Q3 2020), the default branch is configurable, and now (2021+) set to main, no longer … Read more
Starting Git 2.0.1 (June 25th, 2014), a git mv will just work on a case-insensitive OS. See commit baa37bf by David Turner (dturner-tw). mv: allow renaming to fix case on case-insensitive filesystems “git mv hello.txt Hello.txt” on a case-insensitive filesystem always triggers “destination already exists” error, because these two names refer to the same path … Read more
Update: Using Git Switch All of the information written below was accurate, but a new command, git switch has been added that simplifies the effort. If daves_branch exists on the remote repository, but not on your local branch, you can simply type: git switch daves_branch Since you do not have the branch locally, this will … Read more
You can override any checks that Git does by using “force push”. Use this command in the terminal: git push -f origin master However, you will potentially ignore the existing work that is in remote. You are effectively rewriting the remote’s history to be exactly like your local copy.
posh-git and git for windows 2.7 should include everything you need to setup an ssh-agent. Once you have the module installed you can start the agent using something like: Import-Module ~\Documents\WindowsPowerShell\Modules\posh-git\posh-git Set-Alias ssh-agent “$env:ProgramFiles\git\usr\bin\ssh-agent.exe” Set-Alias ssh-add “$env:ProgramFiles\git\usr\bin\ssh-add.exe” Start-SshAgent -Quiet You then should see the SSH_AUTH_SOCK environmental variable is set: C:\Code\Go\src\bosun.org\cmd\scollector [master]> gci env:SSH_AUTH_SOCK Name Value … Read more
My solution for a similar situation was to replace a hash of the damaged object in .git/refs/heads/my-working-branch with a hash of previous commit (which can be found in .git/logs/HEAD).
Why Git won’t let you push to non-bare repositories The original poster says: One solution is to run the following command: git config receive.denyCurrentBranch ignore After this it works, but I would like to know why I need to use this option. Is this the only option? What are the consequences of doing this? As … Read more
Using git-hg. First, make sure there is a (non-Mercurial) git submodule under your main repository. If you don’t have other submodules yet, just create a dummy submodule for some library other than core-plot, for instance: main-repo $ git submodule add https://repo.url.com/repo.git repo Second, clone the core-plot library into some directory. main-repo $ git-hg clone https://code.google.com/p/core-plot/ … Read more
If I understand correctly, you’re using HTTP basic authentication over HTTPS to allow only particular developers to access the repository. In that case, you can commit a .gitmodules that looks like: [submodule foo] path = sub/foo url = https://example.com/git/foo.git … i.e. without a user name, and then tell each developer to put their username and … Read more