Set up the CRLF and the problem will “disappear” # Option 1: git config –global core.autocrlf false # Option 2: `git config –global core.safecrlf false` https://help.github.com/articles/dealing-with-line-endings
Looks like you’re looking for the –ext-diff option. Here’s what git show docs say about it: –ext-diff Allow an external diff helper to be executed. If you set an external diff driver with gitattributes, you need to use this option with git-log and friends.
They have just released a version that allows a config option to stop git hanging. Fix is for https://github.com/msysgit/git/issues/101 in release https://github.com/msysgit/msysgit/releases/tag/Git-1.9.4-preview20140611 You can fix it by setting git config –global sendpack.sideband false
Adapted from this gist on how to print git status of all repositories under the current folder: find . -type d -name ‘.git’ | while read dir ; do sh -c “cd $dir/../ && echo -e \”\nGIT STATUS IN ${dir//\.git/}\” && git status -s” ; done The find command is your friend, along with some … Read more
Edit, September 2020: This is becoming more common because people are renaming existing master branches to main or similar in various server-side bare repositories. For a TL;DR, if you’ve done this in a server-side bare repository—or made a repository with git init –bare without also updating the initial master part—you will want to adjust the … Read more
You can use the following command to have master point to a new location: git branch -f master branchToMoveMasterTo What this is actually doing is creating a new branch called master that points to branchToMoveMasterTo. Since we already have a branch called master, we need the -f flag to say we want to delete the … Read more
Expanding on other answers, these are the steps I took on a fork I had of tsc-watch: git remote add upstream https://github.com/gilamran/tsc-watch.git git fetch upstream git merge upstream/master git push Explained: adding the remote server as upstream (alias) fetch all changes from the upstream remote merge changes from upstream/master branch into my current branch push … Read more
I confirm that git and msysgit can coexist on the same computer, as mentioned in “Which GIT version to use cygwin or msysGit or both?”. Git for Windows (msysgit) will run in its own shell (dos with git-cmd.bat or bash with Git Bash.vbs) Update 2016: msysgit is obsolete, and the new Git for Windows now … Read more
Git tries to clone the submodule using ssh and not https. If you haven’t configured your ssh key this will fail. You can setup ssh-agent to cache the password for the ssh key and get git to use that. Or change to https. Git is a bit confusing regarding submodules. They are configured in the … Read more
As CommuSoft says, you’re not on master. You’re in “detached HEAD” mode. You get that any time you explicitly check out something that is not a (local) branch name: $ git checkout origin/master # detach to “remote branch” or if there’s a tag v1.7: $ git checkout v1.7 # detach to tag and you can … Read more