Yes, you can.  Try it, it works fine.  Put a `.gitignore` in the root of your repo, and put another `.gitignore` with additional things to ignore in a subdirectory.

Similar question was: https://stackoverflow.com/questions/3305869/are-multiple-gitignores-frowned-on (Jul 2010)

Or if you can have different version of a `.gitignore` file per branch:  https://stackoverflow.com/questions/2250040/using-github-to-host-public-git-repositories-whilst-ensuring-that-sensitive-data/2250144#2250144 (Feb 2010)

Further perhaps related: https://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-s/930495#930495

You can just specify files to ignore in a format such as

    Xyz/*.abc

 in the .gitignore in the root directory, potentially removing the need for separate ignore files.

I can&#39;t pop my stash because I merged a branch which apparently conflicts with my stash and now my stash is seemingly unable to be popped.

    app.coffee: needs merge
    unable to refresh index

Anyone know how to resolve this?

**FIXED!**

Turns out the actual issue was an unresolved merge conflict from the merge, **NOT** that the stash would cause a merge conflict.

Resolution: Commit the conflicted file.

Git stash pop- needs merge, unable to refresh index

I&#39;m wondering if there is a way to force Heroku to recompile the slug without pushing new commits and/or updating the config variables.

Why would I want to do this?:

I am using the Cedar stack on Heroku for a Rails 3.2 app, and I am having problems with the `rake assets:precompile` task failing (during compilation only --- later it works fine with a `heroku run`).  I highly suspect this is due to certain environment variables not being available during slug compilation time, and I think the `heroku labs:enable user_env_compile` experimental feature will solve this. 

However, with the `user_env_compile` feature turned on, config changes do not trigger a recompilation of the slug, and my code hasn&#39;t changed, so I don&#39;t have any new commits to push.

Of course, I could push a &quot;dummy&quot; commit with a trivial change, which is probably the simplest answer --- but I&#39;m wondering if there&#39;s a heroku command that will let me directly recompile the slug.

Thanks!



Recompile Heroku slug without push or config change

Can you create a .gitignore file in a directory that only applies to files (and directories) within that directory?

Can you have additional .gitignore per directory within a single repo?

<p>Can you create a .gitignore file in a directory that only applies to files (and directories) within that directory?</p>


Due to some deployment issues I stopped tracking schema.rb in git. Somehow I have stuffed this up and somewhere along the way my schema.rb file has disappeared.

Is there a way of regenerating schema.rb from the database or from the migrations? I would prefer not to lose the existing data.


Lost my schema.rb! Can it be regenerated?

For example, `https://github.com/vanillaforums/Garden` is the GitHub repository. But I only want to &#39;watch&#39; this directory `https://github.com/vanillaforums/Garden/tree/master/plugins` in the repository.

How do I do that? There doesn&#39;t seem to be a way.

How to &#39;Watch&#39; only a directory in a GitHub repository?

Is there any size limit to the Git commit message?
I searched trough the web but cannot find any relevant mention about this except [this one][1].

However, that one does not answer my question.


  [1]: http://lists.busybox.net/pipermail/busybox-cvs/2010-March/030975.html

Maximum commit message size

Say my current branch is myfeature. I want to get master up to date. Both `git merge` `git pull` always merge into the current branch, as far as I can tell.

Is there a way to merge changes from a remote branch (eg, origin/master) into a branch I&#39;m not currently on (master)? I can think of one way:

    git stash
    git checkout master
    git pull origin/master
    git checkout myfeature
    git stash apply

Is there a better one?

(It&#39;s possibly my whole question is wrong: would `git fetch` automatically update master to match origin/master, if remote-tracking is enabled?)

How to pull into not-the-current-branch?

So I first forked a repo and then made a commit to that forked repo. I then opened a pull request. The pull request listed all the changes I wanted.

After reviewing my pull request, there were a number of changes that the repo owner wanted me to make before he accepted it. I have made those changes in my fork, now how do I update the pull request with those changes (or is this not how I should handle it)?

How to update a pull request from forked repo?

&gt; **Possible Duplicate:**  
&gt; [View the change history of a file using Git versioning](https://stackoverflow.com/questions/278192/view-the-change-history-of-a-file-using-git-versioning)  

&lt;!-- End of automatically inserted text --&gt;

Sometimes I want to step through the history of a particular file. In the past I used P4V and this was very quick and intuitive. 

  1. Right click on a file and select history.
  2. Scrolling through the dates and see a nice diff of exactly what changed in **that** file on **that** date. Simple.

Switching to git this is now a grueling task. 


  1. &quot;git log filename&quot;
  2. Look at history and pick a date, copy hash
  3. &quot;git diff hash&quot;
  4. Scroll through diff for the stuff that changed in the file I am interested in.
  5. Nope, that&#39;s not it, lets try a different date - back to step 2, rinse and repeat.

I&#39;ve searched SO, and I&#39;ve tried a few of the commonly suggested guis: github, gitk, gitg, git-gui.

These all remove the need to manually run commands, but the workflow is the same for this. View history of file; view commit; search through diff of lots of irrelevant files. It&#39;s slow and repetitive.

All the data is in the repo so I see no reason this simple common use case could not be more streamlined.

Can anyone recommend a tool that does this - or a more efficient way to utilize the command line to do what I want?

Thanks for any suggestions.

Show history of a file?

I&#39;d like to get the number of commits per author on all branches. I see that

    git shortlog -s -n

Prints a very nice list but it is not counting the commits that are not yet merged from other branches. If iterate this command over every branch then obviously the common commits get counted multiple times. Could you give me a script/command that would yield me the overall picture?

Git number of commits per author on all branches

How can I remove all untracked files from an SVN checkout with the `svn` command line tool? Git and Hg offer `clean` and `purge` commands for this purpose, but I can&#39;t find the corresponding command in SVN.

I don&#39;t care if I have to revert all my local modifications in the process (in which case I&#39;d essentially want to restore my checkout to a pristine state) or whether local modifications to tracked files can remain intact; either situation is acceptable.

How to remove untracked files in SVN

I have a working copy for my entire repository, which contains multiple Python projects.  When I choose right-click --&gt; SVN Update in Windows File Explorer I am getting an error message listing a particular project folder:

    Command: Update
    Updating: path\to\working\copy
    Skipped obstructing working copy: path\to\working\copy\project
    Completed: At revision: 176
    Warning!: One or more files are in a conflicted state.

When I go to that project and right-click --&gt; SVN Update, it updates successfully.  There is also not conflict editor available and when I right-click --&gt; TortoiseSVN --&gt; Resolved there are not files available.

What could be causing the conflict?  As long as this keeps occurring, it is impossible to update this project in my working copy.

TortoiseSVN reports conflict, but no conflict can be found

I would like, if someone could give me more detail in working with git and remote repositories. I haven&#39;t worked with remote repositories, yet.

To the local repository you commit smaller changes that may not be too world-shattering. What is pushed to the remote repository? Every local commit? Or the overall-work that was done, which is then merged with overall-works of others? I think the log of the remote repository must be confusing, if everyone pushes every commit.


Do you push every single commit?

I am curious about how to remove the first commit in git.

What is the revision before committing any thing? Does this revision have a name or tag?

How to remove the first commit in git?

I recently learned ASP.NET MVC (I love it). I&#39;m working with a company that uses dependency injection to load a Repository instance in each request, and I&#39;m familiar with using that repository.

But now I&#39;m writing a couple of MVC applications of my own. I don&#39;t fully understand the hows and whys of the repository my company uses, and I&#39;m trying to decide the best approach to implement data access.

I am using C# and Entity Framework (with all the latest versions).

I see three general approaches for handling data access.

1. Regular DB context within a using statement each time I access data. This is simple and it works okay. However, if two locations need to read the same data within one request, the data must be read twice. (With a single repository per request, the same instance would be used in both places and I understand the second read would simply return the data from the first read.)

2. A typical [repository pattern](http://www.asp.net/mvc/tutorials/getting-started-with-ef-using-mvc/implementing-the-repository-and-unit-of-work-patterns-in-an-asp-net-mvc-application). For reasons I don&#39;t understand, this typical pattern involves creating a wrapper class for every table used from the database. That seems wrong to me. In fact, since they are implemented also as interfaces, I&#39;d technically be creating two wrapper classes for each table. EF creates tables for me. I don&#39;t believe this approach makes sense.

3. There is also a [generic repository pattern](http://www.tugberkugurlu.com/archive/generic-repository-pattern-entity-framework-asp-net-mvc-and-unit-testing-triangle) where a single repository class is created to serve all entity objects. This makes much more sense to me. But does it make sense to others? Is the link above the best approach?

I&#39;d love to get some input from others on this topic. Are you writing your own repository, using one of those above, or doing something different altogether. Please share.





Best Repository Pattern for ASP.NET MVC

I have a local repository. I created the whole application, but now I want to push it to a remote repository. I already have remote repo as well. How can I connect these two repositories without losing any work that I did?




Connect a local repository with a remote repository

i&#39;m adding this to **.gitignore** file

    .idea/*

but anyway the status is:

    #       modified:   .gitignore
    #       modified:   .idea/.generators
    #       modified:   .idea/dovezu.iml
    #       modified:   .idea/misc.xml
    #       modified:   .idea/workspace.xml

what am i doing wrong ?
i even added .idea/* to the global **~/.gitignore_global**
but git status, anyway shows me:

    #       modified:   .gitignore
    #       modified:   .idea/.generators
    #       modified:   .idea/dovezu.iml
    #       modified:   .idea/misc.xml
    #       modified:   .idea/workspace.xml

git still shows files as modified after adding to .gitignore

Is it possible to add the `.gitignore` file to `.gitignore` itself?

    .gitignore

Doesn&#39;t work though

I don&#39;t want to see it in edited files

Add .gitignore to gitignore

I have a folder that have a space in the middle, but have a webconfig file inside it. I want git to ignore the webconfig file but somehow it&#39;s not ignoring it because of the space in the folder. Anybody know how to work around this?

    My FolderName/Web.config

I tried to insert the `%20` in the middle but that did not help.

Thank you for your help.


gitignore ignore files within a folder that has whitespace in the middle

I have a remote repo in which I want to commit certain files (the compiled files to deploy them on a cloud computing platform), but I don&#39;t want to deploy them on github...

is there some way to have to different .gitignore files, one for each remote?

git: have different .gitignore file for each remote

Is there a way to ignore all files of a type in a directory?

`**` is apparently meaningless to git, so this doesn&#39;t work:

    /public/static/**/*.js

The idea is to match arbitrary nested folders.

Content Type	Original Author	Original Content on Stackoverflow
Question	B Seven	View Question on Stackoverflow
Solution 1 - Git	Mike Morearty	View Answer on Stackoverflow
Solution 2 - Git	Tats_innit	View Answer on Stackoverflow
Solution 3 - Git	learnvst	View Answer on Stackoverflow

Can you have additional .gitignore per directory within a single repo?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

Recompile Heroku slug without push or config change

Git stash pop- needs merge, unable to refresh index

Attributions