Git has 2 attributes that deal with end-of-lines: text Documentation says: This attribute enables and controls end-of-line normalization. When a text file is normalized, its line endings are converted to LF in the repository This effectively means that when you commit to the repo, it will convert line-endings to LF eol Documentation says: This attribute … Read more
At least for VS 2012 you can actually just update from the command prompt as shown on the Scooter website. http://www.scootersoftware.com/support.php?zz=kb_vcs#gitwindows If you’ve installed msysgitVS using the Configure User Tools thingy in VS, your path to Git will probably be: C:\Program Files (x86)\Git\cmd\git.exe For Git 1.7.6 and newer, edit the global config file to set … Read more
I’ve managed to work around this by: Locate the last commit that retained the order Run git rebase -i <hash of that commit> Replace all pick with reword Run git push -f Before that, I tried changing only the first commit message, which also changes all the following hashes, but that didn’t fix it. I … Read more
Next to the “Merge pull request” button, there should be a “Use the command line” link to instructions on how to do it manually. You should follow these instructions (create new local branch and pull in their changes), but then instead of merging that whole branch back into master, you just cherry-pick the commits you … Read more
No: Including a submodule in a public repository means recording its URL in a public .gitmodules file. The repository at that URL will not be any more accessible through a recursive clone of your repository than it is on its own. That is why, for instance, using submodules with GitHub Pages is not possible: You … Read more
Instead of using git pull (which fetches and merges), try git fetch (which won’t try to merge with your current branch on machine2, and cause conflicts): # Machine 1 $ git push origin testing # Machine 2 $ git fetch origin testing $ git checkout -b testing origin/testing
I experienced something similar recently but excluding and then re-including the missing files didn’t work for me. In VS2013 Premium, I noticed there’s a “Untracked Files” section at the bottom of the Changes window. It was simply a matter of right-clicking the files I wanted to include and adding them. Not ideal, indeed, but another … Read more
npm checks all directories for the existance of a .git directory, and throws the EISGIT error if it exists, so there is no way to ignore it or skip it. The code does however check if it’s a link: mod.parent && !mod.isLink && [checkGit, mod.realpath], So I was able to make it work by symlinking … Read more
.rej files are rejected files (usually hunks patches but not only). When ever you get those files after merge you will manually have to edit them, fix them and then apply them back. You can read here some more about it and what is it .rej file diff a.txt (rejected hunks) …. Fix it manually … Read more
Comment from Git source: /* * Read a directory tree. We currently ignore anything but * directories, regular files and symlinks. That’s because git * doesn’t handle them at all yet. Maybe that will change some * day. * * Also, we ignore the name “.git” (even if it is not a directory). * That … Read more