I think that what you actually want to do is:

    aaa/*
    !aaa/ccc

You&#39;re telling it &quot;don&#39;t look in `aaa`&quot; so it never even examines the path `aaa/ccc`. If you use the wildcard, it still reads the contents of `aaa`, then each entry matches the wildcard and is ignored, except `aaa/ccc` which gets put back in.

If you want to exclude everything in `aaa`, but include `aaa/ccc` and everything beneath it, you should use:

    aaa/*
    !aaa/ccc
    !aaa/ccc/*

The first line tells git to ignore everthing beneath `aaa`, the second tells it not to ignore the folder `aaa/ccc` which actually &quot;enables&quot; the third line which then tells it not to ignore everything beneath `aaa/ccc`.

If anyone&#39;s still not seeing newly un-ignored items in a `git status` running a `git update-index` before hand can help git to see the changes (at least in version 1.9.x of gitbash).

Suppose from `index.py` with CGI, I have post file `foo.fasta` to display file. I want to change `foo.fasta`&#39;s file extension to be `foo.aln` in display file. How can I do it?



Changing file extension in Python

In the [Android docs on AlertDialog][1], it gives the following instruction and example for setting a custom view in an AlertDialog:

&lt;Blockquote&gt;If you want to display a more complex view, look up the FrameLayout called &quot;body&quot; and add your view to it:&lt;/Blockquote&gt;

    FrameLayout fl = (FrameLayout) findViewById(R.id.body);
    fl.add(myView, new LayoutParams(FILL_PARENT, WRAP_CONTENT));

First off, it&#39;s pretty obvious that `add()` is a typo and is meant to be `addView()`.

I&#39;m confused by the first line using R.id.body. It seems that it&#39;s the body element of the AlertDialog ... but I can&#39;t just enter that in my code b/c it gives a compile error. Where does R.id.body get defined or assigned or whatever?

Here&#39;s my code. I tried to use `setView(findViewById(R.layout.whatever)` on the builder but it didn&#39;t work. I&#39;m assuming because I didn&#39;t manually inflate it?

    AlertDialog.Builder builder = new AlertDialog.Builder(this);
    builder.setTitle(&quot;Title&quot;)
        .setCancelable(false)
        .setPositiveButton(&quot;Go&quot;, new DialogInterface.OnClickListener() {
    					
        @Override
        public void onClick(DialogInterface dialog, int id) {
            EditText textBox = (EditText) findViewById(R.id.textbox);
            doStuff();
        }
    });
    
    FrameLayout f1 = (FrameLayout)findViewById(R.id.body /*CURRENTLY an ERROR*/);
    f1.addView(findViewById(R.layout.dialog_view));
    
    AlertDialog alert = builder.create();
    alert.show();

  [1]: http://developer.android.com/reference/android/app/AlertDialog.html


How to implement a custom AlertDialog View

I am attempting to use a .gitignore file with negated patterns (lines starting with !), but it&#39;s not working the way I expect.

As a minimal example, I have the folllowing directory structure:

    C:/gittest
     -- .gitignore
     -- aaa/
       -- bbb/
         -- file.txt
       -- ccc/
         -- otherfile.txt

and in my gitignore file, I have this:

    aaa/
    !aaa/ccc/

My understanding (based on [this doc page][1]) is that the file aaa/ccc/otherfile.txt should not be ignored, but in fact git is ignoring everything under aaa.

Am I misunderstanding this sentence: &quot;An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again.&quot;?

BTW, this is on Windows with msysgit 1.7.0.2.

   


  [1]: https://git-scm.com/docs/gitignore

How do negated patterns work in .gitignore?

I am attempting to use a .gitignore file with negated patterns (lines starting with !), but it's not working the way I expect.
As a minimal example, I have the folllowing directory structure:
<pre><code class="hljs language-lua">C:/gittest
 -- .gitignore
 -- aaa/
 -- bbb/
 -- file.txt
 -- ccc/
 -- otherfile.txt
</code></pre>
and in my gitignore file, I have this:
<pre><code class="hljs language-bash">aaa/
!aaa/ccc/
</code></pre>
My understanding (based on <a href="https://git-scm.com/docs/gitignore" target="_blank" rel="noopener noreferrer">this doc page</a>) is that the file aaa/ccc/otherfile.txt should not be ignored, but in fact git is ignoring everything under aaa.
Am I misunderstanding this sentence: "An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again."?
BTW, this is on Windows with msysgit 1.7.0.2.

I have a Git repository that is accessed from both Windows and OS X, and that I know already contains some files with CRLF line-endings. As far as I can tell, there are two ways to deal with this:

1. Set `core.autocrlf` to `false` everywhere,

2. Follow the instructions [here](https://stackoverflow.com/questions/1510798/trying-to-fix-line-endings-with-git-filter-branch-but-having-no-luck/1511273#1511273) (echoed on GitHub&#39;s help pages) to convert the repository to contain only LF line-endings, and thereafter set &lt;code&gt;core.autocrlf&lt;/code&gt; to &lt;code&gt;true&lt;/code&gt; on Windows and &lt;code&gt;input&lt;/code&gt; on OS X. The problem with doing this is that if I have any binary files in the repository that: 

 1. are not correctly marked as binary in gitattributes, and 
 2. happen to contain both CRLFs and LFs,

    they will be corrupted. It is possible my repository contains such files.

So why shouldn&#39;t I just turn off Git&#39;s line-ending conversion? There are a lot of vague warnings on the web about having &lt;code&gt;core.autocrlf&lt;/code&gt; switched off causing problems, but very few *specific* ones; the only that I&#39;ve found so far are that kdiff3 cannot handle CRLF endings (not a problem for me), and that some text editors have line-ending issues (also not a problem for me).

The repository is internal to my company, and so I don&#39;t need to worry about sharing it with people with different autocrlf settings or line-ending requirements.

Are there any other problems with just leaving line-endings as-is that I am unaware of?


Why should I use core.autocrlf=true in Git?

I love git and use it on OS X pretty much constantly at home.  At work, we use svn on Windows, but want to migrate to git as soon as the tools have fully matured (not just [TortoiseGit][1], but also something akin the really nice Visual Studio integration provided by [VisualSVN][2]).  But I digress...

I recently installed [msysgit][3] on my Windows 7 machine, and when using the included version of bash, it is **horrendously** slow.  And not just the git operations; `clear` takes about five *seconds*.  AAAAH!

Has anyone experienced a similar issue?


----------
**Edit**:  It *appears* that msysgit is not playing nicely with [UAC][uac] and might just be a tiny design oversight resulting from developing on XP or running Vista or 7 with UAC disabled; starting Git Bash using `Run as administrator` results in the lightning speed I see with OS X (or on 7 after starting Git Bash w/o a network connection - see @Gauthier answer).

**Edit 2**: [AH HA!][ahha]  See my answer.

  [1]: http://code.google.com/p/tortoisegit/
  [2]: http://www.visualsvn.com/visualsvn/
  [3]: http://code.google.com/p/msysgit/
  [uac]: http://en.wikipedia.org/wiki/User_Account_Control
  [ahha]: http://code.google.com/p/msysgit/issues/detail?id=320

Msysgit bash is horrendously slow in Windows 7

I had somewhere in my Git repository a line containing the word &quot;Foo&quot; a couple of hundreds of commits before.

If there is any way to find its revision number where it was the last time?

Git history - find lost line by keyword

I did a `git stash pop` and ended up with merge conflicts. I removed the files from the file system and did a `git checkout` as shown below, but it thinks the files are still unmerged. I then tried replacing the files and doing a `git checkout` again and same result. I event tried forcing it with `-f` flag. Any help would be appreciated!

    chirag-patels-macbook-pro:haloror patelc75$ git status
    app/views/layouts/_choose_patient.html.erb: needs merge
    app/views/layouts/_links.html.erb: needs merge
    # On branch prod-temp
    # Changes to be committed:
    #   (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
    #
    #       modified:   db/schema.rb
    #
    # 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)
    #
    #       unmerged:   app/views/layouts/_choose_patient.html.erb
    #       unmerged:   app/views/layouts/_links.html.erb
    
    chirag-patels-macbook-pro:haloror patelc75$ git checkout app/views/layouts/_choose_patient.html.erb
    error: path &#39;app/views/layouts/_choose_patient.html.erb&#39; is unmerged
    chirag-patels-macbook-pro:haloror patelc75$ git checkout -f app/views/layouts/_choose_patient.html.erb
    warning: path &#39;app/views/layouts/_choose_patient.html.erb&#39; is unmerged

git stash blunder: git stash pop and ended up with merge conflicts

How can I uncommit my last commit in git?

Is it

    git reset --hard HEAD

or

    git reset --hard HEAD^

?


How to uncommit my last commit in Git

I have configured numerous `.gitignore` files to filter out many different unwanted files from a set of about 6,000 untracked files. I want to do `git add .` when I&#39;ve got my filtered list looking the way I want it.

But, then I want to disable the `.gitignore` filters temporarily to see what got left behind, and make sure there was nothing important accidentally filtered.

I know that `git-clean` includes an option to ignore `.gitignore files`. Is there a similar option for `git-status`?

I could go through and delete all the `.gitignore` files, do the check, then restore them, but it seems there should be an easier way?

Is there a way to tell git-status to ignore the effects of .gitignore files?

I&#39;m trying to solve a gitignore problem on a large directory structure, but to simplify my question I have reduced it to the following.

I have the following directory structure of two files (foo, bar) in a brand new git repository (no commits so far):

    a/b/c/foo
    a/b/c/bar

Obviously, a &#39;git status -u&#39; shows:

    # Untracked files:
    ...
    #       a/b/c/bar
    #       a/b/c/foo

What I want to do is create a .gitignore file that ignores everything inside a/b/c but does not ignore the file &#39;foo&#39;.

If I create a .gitignore thus:

    c/

Then a &#39;git status -u&#39; shows both foo and bar as ignored:

    # Untracked files:
    ...
    #       .gitignore
    
Which is as I expect.

Now if I add an exclusion rule for foo, thus:

    c/
    !foo

According to the gitignore manpage, I&#39;d expect this to to work. But it doesn&#39;t - it still ignores foo:

    # Untracked files:
    ...
    #       .gitignore

This doesn&#39;t work either:

    c/
    !a/b/c/foo

Neither does this:

    c/*
    !foo

Gives:

    # Untracked files:
    ...
    #       .gitignore
    #       a/b/c/bar
    #       a/b/c/foo

In that case, although foo is no longer ignored, bar is also not ignored.

The order of the rules in .gitignore doesn&#39;t seem to matter either.

This also doesn&#39;t do what I&#39;d expect:

    a/b/c/
    !a/b/c/foo
That one ignores both foo and bar.


One situation that does work is if I create the file a/b/c/.gitignore and put in there:

    *
    !foo

But the problem with this is that eventually there will be other subdirectories under a/b/c and I don&#39;t want to have to put a separate .gitignore into every single one - I was hoping to create &#39;project-based&#39; .gitignore files that can sit in the top directory of each project, and cover all the &#39;standard&#39; subdirectory structure.

This also seems to be equivalent:

    a/b/c/*
    !a/b/c/foo
This might be the closest thing to &quot;working&quot; that I can achieve, but the full relative paths and explicit exceptions need to be stated, which is going to be a pain if I have a lot of files of name &#39;foo&#39; in different levels of the subdirectory tree.

Anyway, either I don&#39;t quite understand how exclusion rules work, or they don&#39;t work at all when directories (rather than wildcards) are ignored - by a rule ending in a /

Can anyone please shed some light on this?

Is there a way to make gitignore use something sensible like regular expressions instead of this clumsy shell-based syntax?

I&#39;m using and observe this with git-1.6.6.1 on Cygwin/bash3 and git-1.7.1 on Ubuntu/bash3.


        



How do .gitignore exclusion rules actually work?

I have a gitignore file that makes git ignore `*.dll` files, and that is actually the behavior I want. However, if I want an exception ( i.e. to be able to commit `foo.dll`), how can I achieve this?

git ignore exception

Every developer on my team has their own local configuration.  That configuration information is stored in a file called `devtargets.rb` which is used in our rake build tasks. I don&#39;t want developers to clobber each other&#39;s devtargets file, though. 

My first thought was to put that file in the `.gitignore` list so that it is not committed to git.

Then I started wondering: is it possible to commit the file, but ignore changes to the file? So, I would commit a default version of the file and then when a developer changes it on their local machine, git would ignore the changes and it wouldn&#39;t show up in the list of changed files when you do a git status or git commit.

Is that possible?  It would certainly be a nice feature...

Can I &#39;git commit&#39; a file and ignore its content changes?

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

Content Type	Original Author	Original Content on Stackoverflow
Question	Chris Perkins	View Question on Stackoverflow
Solution 1 - Git	Cascabel	View Answer on Stackoverflow
Solution 2 - Git	xmak	View Answer on Stackoverflow
Solution 3 - Git	alexkb	View Answer on Stackoverflow

How do negated patterns work in .gitignore?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

How to implement a custom AlertDialog View

Changing file extension in Python

Attributions