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:
A similar alternative is the –strategy-option (short form -X) option, which accepts theirs. For example: However, this is more equivalent to -X ours than -s ours. The key difference being that -X performs a regular recursive merge, resolving any conflicts using the chosen side, whereas -s ours changes the merge to just completely ignore the other side. In some cases, the main problem using -X theirs instead of … Read more
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
If you are using this form of the branch command (with start point), it does not matter where your HEAD is. What you are doing: First, you set your HEAD to the branch dev, Second, you start a new branch on commit 07aeec98. There is no bb.txt at this commit (according to your github repo). If you want to start a new branch at … Read more
You can specify the username that SSH should send to the remote system as part of your remote’s URL. Put the username, followed by an @, before the remote hostname.
Reading the git submodule documentation, there is a use-case that ostensibly justifies the existence of git submodule init as a standalone command. If a user who has cloned a repository wishes to use a different URL for a submodule than is specified by the upstream repository, then that user can:
Edit: For newer versions of Git, –set-upstream master has been deprecated, you should use –set-upstream-to instead: As it prompted, you can just run: After that, you can simply run git pull to update your code.
You cannot push anything that hasn’t been committed yet. The order of operations is: Make your change. git add – this stages your changes for committing git commit – this commits your staged changes locally git push – this pushes your committed changes to a remote If you push without committing, nothing gets pushed. If you commit without … Read more
It seems like you want the files ignored but they have already been commited. .gitignore has no effect on files that are already in the repo so they need to be removed with git rm –cached. The –cached will prevent it from having any effect on your working copy and it will just mark as removed the next … Read more
Note: As written in comments below, Using this is dangerous in a collaborative environment: you’re rewriting history