    git rm --cached -r somedir

Will stage the deletion of the directory, but doesn&#39;t touch anything on disk. This works also for a file, like: 

    git rm --cached somefile.ext

Afterwards you may want to add `somedir/` or `somefile.ext` to your `.gitignore` file so that git doesn&#39;t try to add it back.

I would just:

 - Move the folder out of your working tree
 - `git rm` the folder, commit the change
 - Add to `.gitignore` (or `.git/info/excludes`), commit the change
 - Move the folder back

I am having a big problem trying to connect to mysql. When I run:

    /usr/local/mysql/bin/mysql start

I have the following error :

    Can&#39;t connect to local MySQL server through socket &#39;/var/mysql/mysql.sock&#39; (38)

I do have `mysql.sock` under the `/var/mysql` directory.

In `/etc/my.cnf` I have:

    [client]
    port=3306
    socket=/var/mysql/mysql.sock

    [mysqld]
    port=3306
    socket=/var/mysql/mysql.sock
    key_buffer_size=16M
    max_allowed_packet=8M

and in `/etc/php.ini` I have :

    ; Default socket name for local MySQL connects.  If empty, uses the built-in
    ; MySQL defaults.
    mysql.default_socket = /var/mysql/mysql.sock

I have restarted apache using `sudo /opt/local/apache2/bin/apachectl restart`

But I still have the error.

Otherwise, I don&#39;t know if that&#39;s relevant but when I do `mysql_config --sockets` I get

    --socket         [/tmp/mysql.sock]

Can&#39;t connect to local MySQL server through socket &#39;/var/mysql/mysql.sock&#39; (38)

I understand the basics of how ports work. However, what I don&#39;t get is how multiple clients can simultaneously connect to say port 80. I know each client has a unique (for their machine) port. Does the server reply back from an available port to the client, and simply state the reply came from 80? How does this work?

How do multiple clients connect simultaneously to one port, say 80, on a server?

I have a folder which I&#39;d like to remove in my remote repository. I&#39;d like to delete it, but keep the folder in my computer

Remove file from the repository but keep it locally

<p>I have a folder which I'd like to remove in my remote repository. I'd like to delete it, but keep the folder in my computer</p>


I&#39;ve tried `git branch -r`, but that only lists remote branches that I&#39;ve tracked locally. How do I find the list of those that I haven&#39;t? (It doesn&#39;t matter to me whether the command lists *all* remote branches or only those that are untracked.)

How do I list all remote branches in Git 1.7+?

I keep getting this error. I am using Mac. I generated a key and added it to heroku using 

`heroku config:add key=&quot;ssh-rsa blahblah=me@me.com&quot; `

But this doesn&#39;t work. I keep getting the same error. Short of reinstalling ssh-keygen, what can I do about this?



Heroku error: &quot;Permission denied (public key)&quot;

How can I clone git repository with specific revision, something like I usually do in Mercurial:

    hg clone -r 3 /path/to/repository

How to clone git repository with specific revision/changeset?

I am attempting a pretty beefy git merge maneuver right now.  One problem that I am coming across is that I made some changes to some code in my branch, but my colleague moved that code to a new file in his branch.  So when I did `git merge my_branch his_branch`, git did not notice that the code in the new file was the same as the old, and so none of my changes are there.  

What&#39;s the easiest way to go about applying my changes again to the code in the new files.  I won&#39;t have too many problems finding out which commits need to be reapplied (I can just use `git log --stat`).  But as far as I can tell, there is no way to get git to reapply the changes into the new files.  The easiest thing I am seeing right now is to manually reapply the changes, which is not looking like a good idea. 

I know that git recognizes blobs, not files, so surely there must be a way to tell it, &quot;apply this exact code change from this commit, except not where it was but where it now is in this new file&quot;.

git merge: apply changes to code that moved to a different file

*(This question is the opposite of [this one][1])*

How can I go from this

    dev            C - D
                 /
    master A - B 

to this?

    dev                D
                     /
    master A - B - C 

I know I&#39;m going to kick myself when I see the answer, but for the moment I&#39;m a bit stuck...

  [1]: https://stackoverflow.com/questions/1628563/git-move-recent-commit-to-a-new-branch

Point branch to new commit

I am aware of using `.gitignore` file to exclude some files being added, but I have several `config.php` files in source tree and I need to exclude only one, located in the root while other keep under revision control. 

What I should write into `.gitignore` to make this happen?

How to exclude file only from root folder in Git

I&#39;m trying to collect some of my default settings, and one thing I realized I don&#39;t have a standard for is .gitignore files. There&#39;s a great thread showing a [good .gitignore for Visual Studio projects][1], but I don&#39;t see many recommendations for Python and related tools (PyGTK, Django).

So far, I have...

    *.pyc
    *.pyo

...for the compiled objects and...

    build/
    dist/

...for the setuptools output.

What are some best practices for .gitignore files, and where can I go for more about these best practices?

  [1]: https://stackoverflow.com/questions/2143956/gitignore-for-visual-studio-projects-and-solutions

Best practices for adding .gitignore file for Python projects?

I added the following line to `.gitignore`:

    sites/default/settings.php

but when I type `git status` it shows the file as unstaged file.

What&#39;s the problem? All other patterns work well.




Why doesn&#39;t Git ignore my specified file?

I&#39;m trying to implement Git to manage creative assets (Photoshop, Illustrator, Maya, etc.), and I&#39;d like to exclude files from Git based on file size rather than extension, location, etc.

For example, I don&#39;t want to exclude all .avi files, but there are a handful of massive +1GB avi files in random directories that I don&#39;t want to commit. 

Any suggestions?

gitignore by file size?

I want to check in a blank folder to my Git repository. Effectively, I need to ignore all of the files and folders within the folder, but not the folder itself. How can I do this? What should I put in my `.gitignore` file?

For those wondering why I would want to do this, I have an &quot;upload&quot; directory in my repository. I want to commit the blank directory, but without all the contents.

How to .gitignore all files/folder in a folder, but not the folder itself?

Is there a way to add all files no matter what you do to them whether it be deleted, untracked, etc? like for a commit. I just don&#39;t want to have to `git add` or `git rm` all my files every time I commit, especially when I&#39;m working on a large product.

Git add all files modified, deleted, and untracked?

Is there a way to use a command like `git ls-files` to show only untracked files?

The reason I&#39;m asking is because I use the following command to process all deleted files:

    git ls-files -d | xargs git rm

I&#39;d like something similar for untracked files:

    git some-command --some-options | xargs git add

I was able to find the `-o` option to `git ls-files`, but this isn&#39;t what I want because it also shows ignored files.  I was also able to come up with the following long and ugly command:

    git status --porcelain | grep &#39;^??&#39; | cut -c4- | xargs git add

It seems like there&#39;s got to be a better command I can use here.  And if there isn&#39;t, how do I create custom git commands?

Git: list only &quot;untracked&quot; files (also, custom commands)

I accidentally added a folder of images and committed. Then, I made one more commit.
Then I removed those files using `git rm -f ./images` and committed again. 

Right now, I have made a lot more commits in that branch (master). In my HEAD, I don&#39;t have that `./static/images` folder.

Due to this, my repo size has increased a lot. How can I remove those blobs completely? And I want to remove it from my remote GitHub repo too.

Completely remove files from Git repo and remote on GitHub

[GitRef.org - Basic][1]:

&gt; `git rm` will remove entries from the
&gt; staging area. This is a bit different
&gt; from `git reset HEAD` which &quot;unstages&quot;
&gt; files. By &quot;unstage&quot; I mean it reverts
&gt; the staging area to what was there
&gt; before we started modifying things.
&gt; `git rm` on the other hand just kicks
&gt; the file off the stage entirely, so
&gt; that it&#39;s not included in the next
&gt; commit snapshot, thereby effectively
&gt; deleting it.
&gt;
&gt; By default, a `git rm file` will remove the file from the staging area entirely and also off your disk &gt; (the working directory). To leave the file in the working directory, you can use `git rm --cached`.

But what exactly is the difference between `git rm --cached asd` and `git reset head -- asd`?


  [1]: http://gitref.org/basic/

&quot;git rm --cached x&quot; vs &quot;git reset head --​ x&quot;?

I have deleted some files and git status shows as below.

I have committed and pushed. 

GitHub still shows the deleted files in the repository. How can I delete files in the GitHub repository?

    # On branch master
    # Changes not staged for commit:
    #   (use &quot;git add/rm &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #	deleted:    modules/welcome/language/english/kaimonokago_lang.php
    #	deleted:    modules/welcome/language/french/kaimonokago_lang.php
    #	deleted:    modules/welcome/language/german/kaimonokago_lang.php
    #	deleted:    modules/welcome/language/norwegian/kaimonokago_lang.php

If I use `git rm`, it gives the following.

    usage: git rm [options] [--] &lt;file&gt;...

    -n, --dry-run         dry run
    -q, --quiet           do not list removed files
    --cached              only remove from the index
    -f, --force           override the up-to-date check
    -r                    allow recursive removal
    --ignore-unmatch      exit with a zero status even if nothing matched

Content Type	Original Author	Original Content on Stackoverflow
Question	Rodrigo Souza	View Question on Stackoverflow
Solution 1 - Git	jamessan	View Answer on Stackoverflow
Solution 2 - Git	Jeff	View Answer on Stackoverflow

Remove file from the repository but keep it locally

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

How do multiple clients connect simultaneously to one port, say 80, on a server?

Can't connect to local MySQL server through socket '/var/mysql/mysql.sock' (38)

Attributions