If the file is still displayed in the status, even though it is in the .gitignore, make sure it isn&#39;t already tracked.

    git rm --cached config.php

If you just want to ignore it locally, you could also make it ignored by the git status:

    git update-index --assume-unchanged config.php

As [commented][1], do note that using `--assume-unchanged` might cause unwanted data loss as [`git stash`][2] resets the &quot;ignored&quot; files to the state in upstream, undoing local changes, without a warning or saving.


  [1]: https://stackoverflow.com/questions/7231608/how-to-ignore-files-which-are-in-repository/7232354#comment115290716_7232354
  [2]: https://git-scm.com/docs/git-stash

Ignore checked in file:

    git update-index --assume-unchanged file

To revert

    git update-index --no-assume-unchanged file

Revert All

    git update-index --really-refresh 



If the file is already in the repository, and hence the Index/Staging area, then an update to `.gitignore` won&#39;t change that situation. It would keep being committed.

To remove the file from the Index/Staging area use `git rm &lt;file&gt;`.


For example of a blog-post or article.

    &lt;article&gt;
    &lt;h1&gt;header&lt;h1&gt;
    &lt;time&gt;09-02-2011&lt;/time&gt;
    &lt;author&gt;John&lt;/author&gt;
    My article....
    &lt;/article&gt;

The `author` tag doesn&#39;t exist though... So what is the commonly used HTML5 tag for authors?
Thanks.

(If there isn&#39;t, shouldn&#39;t there be one?)

Which HTML5 tag should I use to mark up an author’s name?

I have added one label in my nib file, then its required to have top-left alignment for that lable. As I am providing text at runtime so its not sure that how much lines there are.
So if text contains only single line then it appears as vertical-center aligned. That alignment is not matching with my respective lable in front of it.

For example:

![enter image description here][1]


  [1]: http://i.stack.imgur.com/2kr4j.png

Which is looking odd :(


*Is there any way where i can set label text proper to Top-Left alignment?*




How to set top-left alignment for UILabel for iOS application?

I have a file (`config.php`), that is already committed to a Git repository, but I want to ignore locally, i.e. I want that file to remain in repository, but force Git to ignore any changes to it.

I put the file into `.gitignore`, but it is still marked as changed and Git still is attempting to commit changes to it, every time I commit something. 

Any ideas, what am I missing or doing wrong?

How to ignore files which are in repository?

I have a file (<code>config.php</code>), that is already committed to a Git repository, but I want to ignore locally, i.e. I want that file to remain in repository, but force Git to ignore any changes to it.
I put the file into <code>.gitignore</code>, but it is still marked as changed and Git still is attempting to commit changes to it, every time I commit something.
Any ideas, what am I missing or doing wrong?

I have two projects. One is the &quot;official&quot; project and the second is a light modification (some files added). I created new branch and I put new files to them. But in during development some files common to both branches is changed.

How do I commit only these files?


How do I commit only some files?

Story: in the middle of a project my colleague created a new branch from *master* and started doing her heavy re-factoring  work. I created my branch from *master* and started doing new stuff on the page. We are committing regularly, but only I can rebase code to *master* (because colleagues changes are too heavy and cannot be deployed from master yet). Unfortunately some of our work rely on the same files. So after few days of work when she finally wanted to rebase her changes to *master*, she had a lot of git conflicts. 

    my_branch    #---#----#-#-------#----#--#-----#---#----#----#
                /     \              \   \   \              \    \
    master     *-------*--------------*---*---*--------------*----*----*
                \                                                     /
    her branch   #------#-------#-----------#-----------#------------#


**Question 1 is**: how to prevent lot of git conflicts when we are working on same files? (or what is the best practice in this situation?)

**but this isn&#39;t the end of our question**, ...to be absolutely correct she tried to do rebase from master to her branch (to have changes I committed), so the commit map should look something like this 

    my_branch    #---#----#-#-------#----#--#-----#---#----#----#
                /     \              \   \   \              \    \
    master     *-------*--------------*---*---*--------------*----*----*
                \                   \            \                    /
    her branch   #------#-------#----*------#-----*-----#------------#

And this is what is bothering us. During these rebases she was fixing those conflicts. But git doesn&#39;t remember her decision on conflict fix, so when she did another git rebase from *master* to *her-branch* she had to **fix the same git conflicts again** that she was fixing in previous rebases.

**Question 2 is**: how to tell git to remember git conflict fix after git rebase from *master* branch, so after next rebase we don&#39;t have to fix the same conflicts again?



How to prevent many git conflicts when rebasing many commits?

I forked a project, applied several fixes and created a pull request which was accepted. A few days later, another change was made by another contributor. So my fork doesn&#39;t contain that change. 

How can I get that change into my fork? Do I need to delete and re-create my fork when I have further changes to contribute? Or is there an update button?


How do I update or sync a forked repository on GitHub?

What are the differences between the following commands?:

&lt;!-- language: lang-bash --&gt;

    git diff foo master   # a 
    git diff foo..master  # b
    git diff foo...master # c

[The diff manual](http://jk.gs/git-diff.html#_examples) talks about it:

&gt; Comparing branches
&gt; 
&gt;     $ git diff topic master    &lt;1&gt;
&gt;     $ git diff topic..master   &lt;2&gt;
&gt;     $ git diff topic...master  &lt;3&gt;
&gt; 
&gt; 1. Changes between the tips of the topic and the master branches.
&gt; 2. Same as above.
&gt; 3. Changes that occurred on the master branch since when the topic branch was started off it.

but isn&#39;t totally clear to me.







What are the differences between double-dot &quot;..&quot; and triple-dot &quot;...&quot; in Git diff commit ranges?

I want to make a single commit on different branches at the same time, since, in my project, I have different branches for different clients.

Say, I have made a new feature commit on Branch A. Can I also make this commit on Branch B, Branch C and D at the same time as well? Is there any short cut command for this? This is very troublesome to checkout one branch, and cherrypick the commit everytime, sometime, if the commit is necessary on many branches, it would be a nightmare for me.

Any simple bash script for this operation?

There is a [similar question][1] in there. but rebasing is not that I want.


  [1]: https://stackoverflow.com/questions/4532063/commit-to-multiple-branches-at-the-same-time-with-git

Commit to multiple branches at the same time

I want to set up Git to globally ignore certain files.

I have added a `.gitignore` file to my home directory (`/Users/me/`) and I have added the following line to it:

    *.tmproj

But it is not ignoring this type of files, any idea what I am doing wrong?

Global Git ignore

I committed and pushed some directory to github. After that, I altered the `.gitignore` file adding a directory that should be ignored. Everything works fine, but the (now ignored) directory stays on github.

How do I delete that directory from github and the repository history?

Remove directory from remote repository after adding them to .gitignore

Is there a way to force `git` to add a file despite the `.gitignore` file?

Force add despite the .gitignore file

I&#39;d like to have Git ignore all hidden files and directories. 
i.e. 

 - `.aptitude`
 - `.ssh/`
 - `.bash_rc`
 - `config/.hidden`

Is there a simple rule to cover this without specifically adding each entry?

How to ignore all hidden directories/files recursively in a git repository?

How do you add linux executable files to .gitignore without giving them an explicit extension and without placing them in a specific or /bin directory? Most are named the same as the C file from which they were compiled without the &quot;.c&quot; extension.

How to Add Linux Executable Files to .gitignore?

Say I have a file in my git repository called `foo`.

Suppose it has been deleted with `rm` (not `git rm`).  Then git status will show:

    Changes not staged for commit:

        deleted: foo

How do I stage this individual file deletion?

If I try:

    git add foo

It says:

    &#39;foo&#39; did not match any files.

**Update (9 years later, lol):**

This looks like it has been fixed in git 2.x:

    $ git --version
    git version 2.25.1

    $ mkdir repo

    $ cd repo

    $ git init .
    Initialized empty Git repository in repo/.git/

    $ touch foo bar baz

    $ git add foo bar baz

    $ git commit -m &quot;initial commit&quot;
    [master (root-commit) 79c736b] initial commit
    3 files changed, 0 insertions(+), 0 deletions(-)
    create mode 100644 bar
    create mode 100644 baz
    create mode 100644 foo

    $ rm foo

    $ git status
    On branch master
    Changes not staged for commit:
        deleted: foo

    $ git add foo

    $ git status
    On branch master
    Changes to be committed:
  	    deleted:    foo



Staging Deleted files

I&#39;m trying to learn Git. I&#39;m confused between 

    git rm --cached file

and

    git reset file

both of the commands seem to take the file from staged to un-staged area. How do the commands differ?



git rm --cached file vs git reset file

&gt; **Possible Duplicate:**  
&gt; [How to revert a “git rm -r .”?](https://stackoverflow.com/questions/2125710/how-to-revert-a-git-rm-r)  

&lt;!-- End of automatically inserted text --&gt;

Git SOS here. I worked 10 hours on a project without committing (I know, I know) and then I git added too many files, so I tried using git rm and accidentally deleted EVERYTHING. Is there hope for me? :(((

Git - undoing git rm

I need to exclude a folder (name uploads) from tracking. I tried to run

    git rm -r --cached wordpress/wp-content/uploads

and after that I added the path to .gitignore

    /wordpress/wp-content/uploads

but when I ran `git status` they show up as deleted. If I try to commit the changes, the files will be deleted, not only removed from tracking.

What am I doing wrong? 

I have also tried

    git update-index --assume-unchanged &lt;file&gt;

but this seems to untrack only files. But I need to remove an entire folder (including subfolders) from tracking.

Content Type	Original Author	Original Content on Stackoverflow
Question	prcaen	View Question on Stackoverflow
Solution 1 - Git	VonC	View Answer on Stackoverflow
Solution 2 - Git	shiva kumar	View Answer on Stackoverflow
Solution 3 - Git	Philip Oakley	View Answer on Stackoverflow

How to ignore files which are in repository?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

How to set top-left alignment for UILabel for iOS application?

Which HTML5 tag should I use to mark up an author’s name?

Attributions