Not really related to this answer, but I’d ditch git pull, which just runs git fetch followed by git merge. You are doing three merges, which is going to make your Git run three fetch operations, when one fetch is all you will need. Hence: Controlling the trickiest merge The most interesting part here is git merge -X theirs. As root545 … Read more
If you do a git pull with a remote branch name, it will fetch the remote branch and then merge it into your current local branch. So to undo that, you will first have to reset your local branch to the remote master, then create a new local vs12up branch from the corresponding remote branch. Reset your local master to match the … Read more
I ran into this issue with OSX. Original answer: It seems like a gpg update (of brew) changed to location of gpg to gpg1, you can change the binary where git looks up the gpg: If you don’t have gpg1: brew install gpg1. Updated answer: It looks like gpg1 is being deprecated/“gently nudged out of usage”, so you probably … Read more
Remove directory from git and local You could checkout ‘master’ with both directories; Remove directory from git but NOT local As mentioned in the comments, what you usually want to do is remove this directory from git but not delete it entirely from the filesystem (local) In that case use:
I came here because I had the same problem. From your question, I realized that I was copying the contents from the wrong file, without the .pub extension (it was my private key, i.e. the id_rsa file, which should be kept private at all times!) From a MAC: Copy exactly from the end (with be the last letter of your email … Read more
Note: As written in comments below, Using this is dangerous in a collaborative environment: you’re rewriting history
Use the <sup></sup>tag (<sub></sub> is the equivalent for subscripts). See this gist for an example.
Your local branch doesn’t know about the remote branch. If you don’t tell git that your local branch (master) is supposed to compare itself to the remote counterpart (origin/master in this case); then git status won’t tell you the difference between your branch and the remote one. So you should use: or with the short option: This options –set-upstream-to (or -u in … Read more
The raw.githubusercontent.com domain is used to serve unprocessed versions of files stored in GitHub repositories. If you browse to a file on GitHub and then click the Raw link, that’s where you’ll go. The URL in your question references the install file in the master branch of the Homebrew/install repository. The rest of that command just retrieves the file and runs ruby on its contents.
The wiki is talking from a forked repo point of view. You have access to pull and push from origin, which will be your fork of the main diaspora repo. To pull in changes from this main repo, you add a remote, “upstream” in your local repo, pointing to this original and pull from it. … Read more