&gt; An optional prefix `!` which negates the
&gt; pattern; any matching file excluded by
&gt; a previous pattern will become
&gt; included again. If a negated pattern
&gt; matches, this will override lower
&gt; precedence patterns sources.

https://git-scm.com/docs/gitignore

    *.json
    !spec/*.json

If the classes below were not templates I could simply have `x` in the `derived` class. However, with the code below, I *have to* use `this-&gt;x`. Why?

    template &lt;typename T&gt;
    class base {
    
    protected:
    	int x;
    };
    
    template &lt;typename T&gt;
    class derived : public base&lt;T&gt; {
    
    public:
    	int f() { return this-&gt;x; }
    };
    
    int main() {
    	derived&lt;int&gt; d;
    	d.f();
    	return 0;
    }

Why do I have to access template base class members through the this pointer?

I have asked Git to perform a commit from within git bash, It has brought up VI as it always does.

I now wish to cancel the commit, how do I prevent proceeding with the commit from this point?

How do I stop a Git commit when VI is on the screen waiting for a commit message?

I have a directory structure like this:

* root
   * folder1
      * abc.json
      * def.json
      * somedir
         * more.json
   * folder2
      * qwe.json
      * rty.json
   * spec
      * mock1.json
      * mock2.json
      * somedir
         * more_mocks.json


Now using a `.gitignore` I want to ignore all `*.json` files except for the ones in the `spec`.  I don&#39;t want to use a `.gitignore` in `folder1` and `folder2` because there are a ton of these and they will get added to a lot, and I&#39;m sure I will forget to move the right `.gitignore` file in place.

In addition, there may be more nested directories with JSON files, and this rule needs to apply to all subdirectories as well.

So how do I ignore all files of a type, except for a certain subdirectory?

git ignore all files of a certain type, except those in a specific subfolder

I have a directory structure like this:
<ul>
<li>root
<ul>
<li>folder1
<ul>
<li>abc.json</li>
<li>def.json</li>
<li>somedir
<ul>
<li>more.json</li>
</ul>
</li>
</ul>
</li>
<li>folder2
<ul>
<li>qwe.json</li>
<li>rty.json</li>
</ul>
</li>
<li>spec
<ul>
<li>mock1.json</li>
<li>mock2.json</li>
<li>somedir
<ul>
<li>more_mocks.json</li>
</ul>
</li>
</ul>
</li>
</ul>
</li>
</ul>
Now using a <code>.gitignore</code> I want to ignore all <code>*.json</code> files except for the ones in the <code>spec</code>. I don't want to use a <code>.gitignore</code> in <code>folder1</code> and <code>folder2</code> because there are a ton of these and they will get added to a lot, and I'm sure I will forget to move the right <code>.gitignore</code> file in place.
In addition, there may be more nested directories with JSON files, and this rule needs to apply to all subdirectories as well.
So how do I ignore all files of a type, except for a certain subdirectory?

I don&#39;t see a difference between the output of &#39;git format-patch&#39; and &#39;git diff&#39;, is there any? And won&#39;t I be able to use &#39;git diff&#39; to produce a patch and then apply it using git apply?

My problem is that I have changes added to the index, but apparently git format-patch only accepts commits, so if I can use the output of diff, then I can use this command to produce a patch for the changes in the index:

    git diff --cached &gt; index.patch


What is the difference between &#39;git format-patch and &#39;git diff&#39;?

I have two branches, `email` and `staging`. `staging` is the latest one and I no longer need the old changes in `email` branch, yet I don&#39;t want to delete them.

So I just want to dump all the contents of `staging` into `email` so that they both point to the same commit. Is that possible?


How do I &#39;overwrite&#39;, rather than &#39;merge&#39;, a branch on another branch in Git?

Taking into consideration that there are several git commands that make no sense in a bare repository (because bare repositories don&#39;t use indexes and do not have a working directory), 

    git reset --hard HEAD^ 

is not a solution to uncommit the last change in such a repository.

Searching through the Internet, all I could find related to the topic is [this][1], in which I am presented three ways of doing this:  
1. &quot;update the ref manually (which involves plumbing)&quot;;  
2. &quot;`git push -f` from a non-bare repository&quot;;  
3. &quot;`git branch -f this $that`&quot;.

  [1]: http://kerneltrap.org/mailarchive/git/2007/7/14/251529

Which solution do yo think is more appropriate or what other ways are there to do this? Unfortunately, the documentation I found about git bare repositories is fairly poor.

How can I uncommit the last commit in a git bare repository?

While using mysysgit under Windows, I do not know how to regain control of the console windows after running **git log** in Git Bash. This seems simple yet I cannot find the key combination or command, so I find myself having to close the console window and relaunching a new instance of Git Bash to interact with git. 

What is the key combination and/or command I need to exit the log viewer?

Mysysgit &quot;(END)&quot; displays, how do I proceed?

How can I undo _every_ change made to my directory after the last commit, including deleting added files, resetting modified files, and adding back deleted files?

Reset all changes after last commit in git

The .gitignore file is very useful in ignoring some of the files that we don&#39;t want to control. Unfortunately, it cannot be used when the file is already under version control. For example, my .gitignore (which is already added to git) file might be different than what my coworker wants it to be (e.g. I want to ignore Vim files). Whenever I make changes to this file, git shows it as a modified file. So my questions:

1. Is there any way to ignore changes for a certain file, which is already controlled by Git?!
2. Is there any way to commit these changes, but keep it for myself only? Obviously, I don&#39;t want to use a branch, because I am working on a certain branch.


Git: Ignoring Version-Controlled Files

I&#39;m writing a short script with a few simple variables at the top of the page. I want to work on them with a friend, but we aren&#39;t sure how to manage the variables needing to be changed after pulling each time for one of us, adding unnecessary junk to git status. I thought about just creating different named branches for each of us, and then the master will just have example usernames set, but it seems silly to have to do all that extra work merging. We could have the variables passed to the script as options, but that isn&#39;t desired, nor is separating it out to another separate configuration file. It would be great to have something like a .gitignore but for only ignore a few lines in a file.

How can this be elegantly managed? How is this problem usually managed?


How to manage configuration files when collaborating?

So I added a folder to my .gitignore file.

Once I do a `git status` it tells me

    # On branch latest
    nothing to commit (working directory clean)

However, when I try to change branches I get the following:

    My-MacBook-Pro:webapp marcamillion$ git checkout develop
    error: The following untracked working tree files would be overwritten by checkout:
    	public/system/images/9/thumb/red-stripe.jpg
    	public/system/images/9/original/red-stripe.jpg
    	public/system/images/8/thumb/red-stripe-red.jpg
    	public/system/images/8/original/red-stripe-red.jpg
    	public/system/images/8/original/00-louis_c.k.-chewed_up-cover-2008.jpg
    	public/system/images/7/thumb/red-stripe-dark.jpg
    	public/system/images/7/original/red-stripe-dark.jpg
    	public/system/images/7/original/DSC07833.JPG
    	public/system/images/6/thumb/red-stripe-bw.jpg
    	public/system/images/6/original/website-logo.png
    	public/system/images/6/original/red-stripe-bw.jpg
    	public/system/images/5/thumb/Guy_Waving_Jamaican_Flag.jpg
    	public/system/images/5/original/logocompv-colored-squares-100px.png
    	public/system/images/5/original/Guy_Waving_Jamaican_Flag.jpg
    	public/system/images/4/thumb/DSC_0001.JPG
    	public/system/images/4/original/logo.png
    	public/system/images/4/original/DSC_0001.JPG
    	public/system/images/4/original/2-up.jpg
    	public/system/images/3/thumb/logo2.gif
    	public/system/images/3/original/logo2.gif
    	public/system/images/3/original/Guy_Waving_Jamaican_Flag.jpg
    	public/system/images/3/original/11002000962.jpg
    	public/system/images/2/thumb/Profile Pic.jpg
    	public/system/images/2/original/Profile Pic.jpg
    	public/system/images/2/original/02 Login Screen.jpg
    	public/system/images/1/original/Argentina-2010-World-Cup.jpg
    Please move or remove them before you can switch branches.
    Aborting

This is what my .gitignore file looks like:

    .bundle
    .DS_Store
    db/*.sqlite3
    log/*.log
    tmp/**/*
    public/system/images/*
    public/system/avatars/*

How do I get this working so I can switch branches without deleting those files?

If I make a change, will it affect those files? In other words, if I came back to this branch afterwards would everything be perfect as up to my latest commit?

I don&#39;t want to lose those files, I just don&#39;t want them tracked.

.gitignore and &quot;The following untracked working tree files would be overwritten by checkout&quot;

I&#39;ve recently started using Git and am having trouble with just one thing. How can I track directories without tracking their contents?

For example the site I&#39;m working on allows uploads. I want to track the uploads directory so that it is created when branching, etc. but obviously not the files within it (test files whilst in develop branch or the real files in master).

In my .gitignore I have the following:
&lt;pre&gt;uploads/*.*&lt;/pre&gt;

Have also tried (which ignores the whole directory):
&lt;pre&gt;uploads/&lt;/pre&gt;

This directory may also contain sub directories (uploads/thumbs/ uploads/videos/) I would like to be able to track these but not their files.

Is this possible with Git? I&#39;ve searched everywhere without finding an answer.

How to track directories but not their files with Git?

I recently reorganized my dotfiles to live inside a Git repository at `~/Dropbox/dotfiles` and I&#39;m using pathogen to bundle all Vim addons inside `~/Dropbox/dotfiles/home/.vim/bundle`. These addons were added as Git submodules.

Now the problem is, when I run Vim, it automatically generates the documentation for all addons and puts them inside each submodule directory. This adds untracked content to the submodules, which I&#39;d like to avoid.

    ruby-1.8.7-p330@gs ~/Dropbox/dotfiles ‹master*› $ git st
    # On branch master
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #   (commit or discard the untracked or modified content in submodules)
    #
    #	modified:   home/.vim/bundle/fuzzyfinder (untracked content)
    #	modified:   home/.vim/bundle/l9 (untracked content)
    #	modified:   home/.vim/bundle/matchit (untracked content)
    #	modified:   home/.vim/bundle/ruby (untracked content)
    #	...
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

I tried to add a `.gitignore` file to the root of my Git repository to ignore all `doc` folders inside submodules, but this doesn&#39;t seem to work:

    home/.vim/bundle/**/doc

My question: is there a way to ignore files and folders inside Git submodules or maybe configure Vim to create the documentation in a folder outside the Git repository?

EDIT: as Randy Morris pointed out, this might be a duplicate of https://stackoverflow.com/questions/4343544/generating-tags-to-different-location-by-pathogen#4346300

Content Type	Original Author	Original Content on Stackoverflow
Question	Alex Wayne	View Question on Stackoverflow
Solution 1 - Git	Amber	View Answer on Stackoverflow

git ignore all files of a certain type, except those in a specific subfolder

Git Problem Overview

Git Solutions

Solution 1 - Git

How do I stop a Git commit when VI is on the screen waiting for a commit message?

Why do I have to access template base class members through the this pointer?

Attributions