What is currently the best way to get a favicon to display in all browsers that currently support it?

Please include:

1. Which image formats are supported by which browsers.

2. Which lines are needed in what places for the various browsers.

What is currently the best way to get a favicon to display in all browsers that support Favicons?

VC++ makes functions which are implemented within the class declaration inline functions.

If I declare a class `Foo` as follows, then are the CONSTRUCTOR and DESTRUCTOR inline functions?

    class Foo 
    {
        int* p;
    public:
        Foo() { p = new char[0x00100000]; }
        ~Foo() { delete [] p; }
    };

    {
        Foo f;
        (f);
    }


In C++ can constructor and destructor be inline functions?

Given the following interaction:

    $ git add foo 
    $ git commit -m &quot;Initial import of &#39;foo&#39;&quot;
    $ rm foo # This could be any destructive action on foo, like editing it.

How do I restore &#39;foo&#39; in my working copy? I&#39;m looking for something like:

    $ git &lt;magic&gt; foo
    Restored foo to revision &lt;blah&gt;.

How do I restore files to previous states in git?

Given the following interaction:
<pre><code class="hljs language-shell">$ git add foo 
$ git commit -m "Initial import of 'foo'"
$ rm foo # This could be any destructive action on foo, like editing it.
</code></pre>
How do I restore 'foo' in my working copy? I'm looking for something like:
<pre><code class="hljs language-php-template">$ git &#x3C;magic> foo
Restored foo to revision &#x3C;blah>.
</code></pre>

I&#39;ve been using git for some time now on Windows (with msysGit) and I like the idea of distributed source control. Just recently I&#39;ve been looking at Mercurial (hg) and it looks interesting. However, I can&#39;t wrap my head around the differences between hg and git.

Has anyone made a side-by-side comparison between git and hg? I&#39;m interested to know what differs hg and git without having to jump into a fanboy discussion.

What is the Difference Between Mercurial and Git?

With SVN, I had a single big repository I kept on a server, and checked-out on a few machines. This was a pretty good backup system, and allowed me easily work on any of the machines. I could checkout a specific project, commit and it updated the &#39;master&#39; project, or I could checkout the entire thing.

Now, I have a bunch of git repositories, for various projects, several of which are on github. I also have the SVN repository I mentioned, imported via the git-svn command..

Basically, I like having all my code (not just projects, but random snippets and scripts, some things like my CV, articles I&#39;ve written, websites I&#39;ve made and so on) in one big repository I can easily clone onto remote machines, or memory-sticks/harddrives as backup.

The problem is, since it&#39;s a private repository, and git doesn&#39;t allow checking out of a specific folder (that I could push to github as a separate project, but have the changes appear in both the master-repo, and the sub-repos)

I *could* use the git submodule system, but it doesn&#39;t act how I want it too (submodules are pointers to other repositories, and don&#39;t really contain the actual code, so it&#39;s useless for backup)

Currently I have a folder of git-repos (for example, ~/code_projects/proj1/.git/ ~/code_projects/proj2/.git/), and after doing changes to proj1 I do `git push github`, then I copy the files into ~/Documents/code/python/projects/proj1/ and do a single commit (instead of the numerous ones in the individual repos). Then do `git push backupdrive1`, `git push mymemorystick` etc

So, the question: How do your personal code and projects with git repositories, and keep them synced and backed-up?

How do you organise multiple git repositories, so that all of them are backed up together?

Suppose your git history looks like this:

1
2
3
4
5

1–5 are separate revisions. You need to remove 3 while still keeping 1, 2, 4 and 5. How can this be done?

Is there an efficient method when there are hundreds of revisions after the one to be deleted?

How do you remove a specific revision in the git history?

In a [previous Git question](https://stackoverflow.com/questions/21848/switch-branch-names-in-git), Daniel Benamy was talking about a workflow in Git:

&gt;  I was working on master and committed some stuff and then decided I wanted to put that work on hold. I backed up a few commits and then branched from before I started my crap work.

He wanted to restore his working state to a previous point in time without losing his current changes. All of the answers revolved around, in various ways, something like

    git branch -m master crap_work
    git branch -m previous_master master

How does this compare to `git stash`? I&#39;m a bit confused trying to see what the different use case here when it *seems* like everything `git stash` does is already handled by branching…

---

@[Jordi Bunster](https://stackoverflow.com/questions/39651/git-stash-vs-git-branch#39862): Thanks, that clears things up. I guess I&#39;d kind of consider &quot;stashing&quot; to be like a lightweight, nameless, branch. So anything stash can do, branch can as well but with more words. Nice!

git-stash vs. git-branch

Handling multiple merges onto branches in Subversion or CVS is just one of those things that has to be experienced. It is inordinately easier to keep track of branches and merges in Mercurial (and probably any other distributed system) but I don&#39;t know why. Does anyone else know?

My question stems from the fact that with Mercurial you can adopt a working practice similar to that of Subversions/CVSs central repository and everything will work just fine. You can do multiple merges on the same branch and you won&#39;t need endless scraps of paper with commit numbers and tag names.

I know the latest version of Subversion has the ability to track merges to branches so you don&#39;t get quite the same degree of hassle but it was a huge and major development on their side and it still doesn&#39;t do everything the development team would like it to do.

There must be a fundamental difference in the way it all works.


How do I restore files to previous states in git?

Git Problem Overview

Git Solutions

In C++ can constructor and destructor be inline functions?

What is currently the best way to get a favicon to display in all browsers that support Favicons?

Attributions