This should be understood in the context of **[GitHub forks][1]** (where you fork a GitHub repo on GitHub before cloning that fork locally).

- `upstream` generally refers to the original repo that you have forked  
(see also &quot;[Definition of “`downstream`” and “`upstream`”][2]&quot; for more on `upstream` term) 
- `origin` is your fork: your own repo on GitHub, clone of the original repo of GitHub

From the GitHub page:

&gt; When a repo is cloned, it has a default remote called `origin` that points to your fork on GitHub, not the original repo it was forked from.  
To keep track of the original repo, you need to add another remote named `upstream`

    git remote add upstream https://github.com/&lt;aUser&gt;/&lt;aRepo.git&gt;

(with `aUser/aRepo` the reference for the original creator and repository, that you have forked)

Note: [since Sept. 2021][3], the unauthenticated git protocol (`git://...`) on port 9418 is no longer supported on GitHub.

You will use `upstream` to **fetch from the original repo** (in order to keep your local copy in sync with the project you want to contribute to).

    git fetch upstream

(`git fetch` alone would fetch from `origin` by default, which is not what is needed here)

You will use `origin` to **pull and push** since you can contribute to your own repository.

    git pull
    git push

(again, without parameters, &#39;origin&#39; is used by default)

You will contribute back to the `upstream` repo by making a **[pull request][4]**.

![fork and upstream][5]


  [1]: https://help.github.com/articles/fork-a-repo/
  [2]: https://stackoverflow.com/a/2749166/6309
  [3]: https://github.blog/2021-09-01-improving-git-protocol-security-github/
  [4]: https://help.github.com/articles/about-pull-requests/
  [5]: http://i.stack.imgur.com/cEJjT.png

In a nutshell answer.

+ origin: the *fork*
+ upstream: the *forked*

after cloning a fork you have to explicitly add a remote upstream, with git add remote &quot;the original repo you forked from&quot;. This becomes your upstream, you mostly fetch and merge from your upstream. Any other business such as pushing from your local to upstream should be done using pull request.

My question is rather simple. I&#39;m aware of the concept of a UUID and I want to generate one to refer to each &#39;item&#39; from a &#39;store&#39; in my DB with. Seems reasonable right?

The problem is the following line returns an error:

    honeydb=# insert into items values(
    uuid_generate_v4(), 54.321, 31, &#39;desc 1&#39;, 31.94);
    ERROR:  function uuid_generate_v4() does not exist
    LINE 2: uuid_generate_v4(), 54.321, 31, &#39;desc 1&#39;, 31.94);
            ^
    HINT:  No function matches the given name and argument types. You might need to add explicit type casts.

I&#39;ve read the page at: http://www.postgresql.org/docs/current/static/uuid-ossp.html

![enter image description here][1]

I&#39;m running Postgres 8.4 on Ubuntu 10.04 x64.


  [1]: http://i.stack.imgur.com/BDeZ3.png

Generating a UUID in Postgres for Insert statement?

What is the difference between Data Access Objects (DAO) and Repository patterns? I am developing an application using Enterprise Java Beans (EJB3), Hibernate ORM as infrastructure, and Domain-Driven Design (DDD) and Test-Driven Development (TDD) as design techniques.

What is the difference between DAO and Repository patterns?

What is the difference between `origin` and `upstream` on [GitHub][1]?

When a `git branch -a` command is executed, some branches it displays have a prefix of `origin` (`remotes/origin/..`) while others have a prefix of `upstream` (`remotes/upstream/..`).

  [1]: http://en.wikipedia.org/wiki/GitHub


What is the difference between origin and upstream on GitHub?

<p>What is the difference between <code>origin</code> and <code>upstream</code> on <a href="http://en.wikipedia.org/wiki/GitHub" target="_blank" rel="noopener noreferrer">GitHub</a>?</p>
<p>When a <code>git branch -a</code> command is executed, some branches it displays have a prefix of <code>origin</code> (<code>remotes/origin/..</code>) while others have a prefix of <code>upstream</code> (<code>remotes/upstream/..</code>).</p>


I get this error when I try to change branch.

Probably I will give some information of the commands at 

    /path/to/git/repo/.

upon command:

    git branch

I get following output

    * V1.5
      V2.0
      master

And when I try the command 

    git checkout V2.0

I get following output:

    fatal: This operation must be run in a work tree

config file contents:


    cat config 
    [core]
            repositoryformatversion = 0
            filemode = true
            bare = true
    [remote &quot;origin&quot;]
            url = /path/to/git/repo/.git

fatal: This operation must be run in a work tree

I understand the scenario presented in Pro Git about [The Perils of Rebasing][1]. The author basically tells you how to avoid duplicated commits:

&gt; Do not rebase commits that you have pushed to a public repository.

I am going to tell you my particular situation because I think it does not exactly fit the Pro Git scenario and I still end up with duplicated commits.

Let&#39;s say I have two remote branches with their local counterparts:

    origin/master    origin/dev
    |                |
    master           dev

All four branches contains the same commits and I am going to start development in `dev`:

    origin/master : C1 C2 C3 C4
    master        : C1 C2 C3 C4
    
    origin/dev    : C1 C2 C3 C4
    dev           : C1 C2 C3 C4

After a couple of commits I push the changes to `origin/dev`:

    origin/master : C1 C2 C3 C4
    master        : C1 C2 C3 C4
    
    origin/dev    : C1 C2 C3 C4 C5 C6  # (2) git push
    dev           : C1 C2 C3 C4 C5 C6  # (1) git checkout dev, git commit

I have to go back to `master` to make a quick fix:

    origin/master : C1 C2 C3 C4 C7  # (2) git push
    master        : C1 C2 C3 C4 C7  # (1) git checkout master, git commit
    
    origin/dev    : C1 C2 C3 C4 C5 C6
    dev           : C1 C2 C3 C4 C5 C6

And back to `dev` I rebase the changes to include the quick fix in my actual development:

    origin/master : C1 C2 C3 C4 C7
    master        : C1 C2 C3 C4 C7
    
    origin/dev    : C1 C2 C3 C4 C5 C6
    dev           : C1 C2 C3 C4 C7 C5&#39; C6&#39;  # git checkout dev, git rebase master

If I display the history of commits with GitX/gitk I notice that `origin/dev` now contains two identical commits `C5&#39;` and `C6&#39;` which are different to Git. Now if I push the changes to `origin/dev` this is the result:

    origin/master : C1 C2 C3 C4 C7
    master        : C1 C2 C3 C4 C7
    
    origin/dev    : C1 C2 C3 C4 C5 C6 C7 C5&#39; C6&#39;  # git push
    dev           : C1 C2 C3 C4 C7 C5&#39; C6&#39;

Maybe I don&#39;t fully understand the explanation in Pro Git, so I would like to know two things:

 1. Why does Git duplicate these commits while rebasing? Is there a particular reason to do that instead of just applying `C5` and `C6` after `C7`?
 2. How can I avoid that? Would it be wise to do it?

  [1]: https://git-scm.com/book/en/v2/Git-Branching-Rebasing#_rebase_peril

Git commits are duplicated in the same branch after doing a rebase

When I do &#39;git commit&#39;, I&#39;m getting the following:

`fatal: Unable to create &#39;project_path/.git/index.lock&#39;: File exists.`

However, when I do &lt;code&gt;ls project_path/.git/index.lock&lt;/code&gt; it&#39;s saying the file doesn&#39;t exist. Any thoughts on what I should do? I&#39;ve also noticed that project_path/.git is owned by root, not sure if that has anything to do with the problem I&#39;m encountering.

git version is 1.7.5.4

edit: It seems that the problem most likely was another process I had running, that was writing (unbeknownst to me) to the project directory. I restarted my machine and then I had no problem committing.

git index.lock File exists when I try to commit, but cannot delete the file

&gt; **Possible Duplicate:**  
&gt; [git - removing a file from source control (but not from the source)](https://stackoverflow.com/questions/936249/git-removing-a-file-from-source-control-but-not-from-the-source)  

&lt;!-- End of automatically inserted text --&gt;

I have a `.classpath` file which is currently in GIT repository.

After I pulled from remove repository(`git pull origin master`). How can I remove this file from GIT control, I mean `NOT to delete` this file from my computer **but** remove it from GIT version control. (Because this file is not needed for version control).

**P.S.**

I tried `git rm &lt;path-to&gt;/.classpath` , but then my whole project complains about wrong class path, why git rm delete my file instead of remove from version control ???

remove a file from GIT control

Every time I use git to interact with a remote, such as when pulling or pushing, I am shown the following message:

&gt; Warning: Permanently added &#39;...&#39; (RSA) to the list of known hosts.

How can I prevent this annoying message from displaying? It is only an annoyance—everything functions properly.

Git says &quot;Warning: Permanently added to the list of known hosts&quot;

Here&#39;s a Github repository of mine: https://github.com/n1k0/casperjs

There&#39;s a `gh-pages` branch to hold the project documentation, which is basically the project website: https://github.com/n1k0/casperjs/tree/gh-pages

This branch setups the documentation site at http://n1k0.github.com/casperjs/ — hurray.

In the meanwhile, I&#39;ve bough the `casperjs.org` domain to get this website available through it, so I put a `CNAME` file as [recommended in the docs](http://pages.github.com/#custom_domains): https://github.com/n1k0/casperjs/blob/gh-pages/CNAME — in their example, the operation is supposed to *create redirects from www.example.com and charlie.github.com to example.com*…

While the website now points to http://casperjs.org/, there&#39;s no 301 redirect from http://n1k0.github.com/casperjs/ (the old site url) to the new domain name.

Any idea how to setup such a redirect, if it&#39;s even possible? Is it a bug? If it is, where should I open an issue?


301 redirect for site hosted at github?

I am writing a readme for my github project in the .md format. Is there a way can I test what my readme.md file will look like before committing to github?   

How can I test what my readme.md file will look like before committing to github?

I&#39;m still new to all things git and was wondering what is best practice in regards to config files. My local development server needs different config values to my live one so how can I stop it pushing / pulling those files?

Git best practice for config files etc

I&#39;m using the github Gui from their website to manage my repos, and I&#39;m getting the following error:

    fatal: https://github.com/TeaCodie/TeaCodie-Website.git/info/refs not found: 
    did you run git update-server-info on the server?


How can I fix this?

&quot;did you run git update-server-info&quot; error on a Github repository

I&#39;m trying to push a new local branch `product-0.2` to remote where there is already a tag with the same name (but the branch itself does not exist)

    git push -v --tags --set-upstream origin product-0.2:product-0.2 
    Pushing to https://****@github.com/mycompany/product.git
    error: src refspec product-0.2 matches more than one.
    error: failed to push some refs to &#39;https://****@github.com/mycompany/product.git&#39;

Same with:

    git push origin product-0.2:/refs/heads/product-0.2 

Although the other way around it works, e.g. create a branch `product-0.1`, commit on it then apply a tag `product-0.1`.

Some people work around this by removing the conflicting tag locally, then push the branch, then retrieve the remote tag, but it seems cumbersome and error prone.

How can I create my branch with minimal fuss?

Thanks for your input

git push local branch with same name as remote tag

My colleague and I are working on the same repository. We&#39;ve branched it into two branches, each technically for different projects, but they have similarities, so we&#39;ll sometimes want to commit back to the *`master` from the `branch`.

However, I have the `branch`. How can my colleague pull that branch specifically?

A `git clone` of the repository does not seem to create the branches locally for him, though I can see them live on unfuddle after a push on my end.

Also, when I originally made the branch, I did `-b checkout`. Does that make much difference?

    $ git branch -r
    origin/HEAD -&gt; origin/master
    origin/daves_branch
    origin/discover
    origin/master

    $ git fetch origin discover
    $ git checkout discover

These are the commands I ran. But it definitely is not working.

**I want to be able to check out that branch and then push and commit back just the branches changes from various collaborators or workstations**.


Git fetch remote branch

I got back on an old project and I ran the nice `git status` to figure out what was going on and I noticed way too many branches! I want to do some housekeeping before starting to work on this again but I&#39;m not sure which branch comes from which..

E.G. Does &quot;branchA&quot; derive from &quot;develop&quot;? Does &quot;branchB&quot; derive from &quot;master&quot; or &quot;branchA&quot;??

How can I answer the sample questions above?

Where did I branch from?

Does anybody know the difference between these two commands to switch and track a remote branch?

    git checkout -b branch origin/branch
    git checkout --track origin/branch

I think both keep track of the remote branch so I can push my changes to the branch on origin, right?

Are there any practical differences?

Difference between git checkout --track origin/branch and git checkout -b branch origin/branch

Suppose your git commit history looks like this:

    A---B---C---D---E---F master
         \         /
          X---Y---Z topic

Is it possible to have git list only the commits on master, A-F? In other words, if the commit was on a merged-in branch, I don&#39;t want it show.

Content Type	Original Author	Original Content on Stackoverflow
Question	jan	View Question on Stackoverflow
Solution 1 - Git	VonC	View Answer on Stackoverflow
Solution 2 - Git	TUSqasi	View Answer on Stackoverflow
Solution 3 - Git	Jude Ukana	View Answer on Stackoverflow

What is the difference between origin and upstream on GitHub?

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

Solution 3 - Git

What is the difference between DAO and Repository patterns?

Generating a UUID in Postgres for Insert statement?

Attributions