gergely/git-reference
1
0
Fork 0
Code Releases Activity

Merge remote branch 'ab9/master'

Browse Source
This commit is contained in:
Scott Chacon 2010-10-15 12:42:36 -07:00
commit a92a8e002e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -38,7 +38,7 @@ layout: reference
<p> <p>
Let's start from scratch. Assume you are designing a new source Let's start from scratch. Assume you are designing a new source
code management system. How do you do basic version control before code management system. How did you do basic version control before
you used a tool for it? Chances are that you simply copied your you used a tool for it? Chances are that you simply copied your
project directory to save what it looked like at that point. project directory to save what it looked like at that point.
</p> </p>

8
remotes/index.html
View File

@ -194,7 +194,7 @@ github git@github.com:schacon/hw.git (push)
that is tracked by whatever branch you are currently in. I personally don't much that is tracked by whatever branch you are currently in. I personally don't much
like this command - I prefer running <code>fetch</code> and <code>merge</code> like this command - I prefer running <code>fetch</code> and <code>merge</code>
seperately. Less magic, less problems. However, if you like this idea, you seperately. Less magic, less problems. However, if you like this idea, you
can read about it in more detail in the. can read about it in more detail in the
<a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-pull.html">official docs</a>. <a target="new" href="http://www.kernel.org/pub/software/scm/git/docs/git-pull.html">official docs</a>.
</p> </p>
@ -280,7 +280,7 @@ To git@github.com:schacon/hw.git
</pre> </pre>
<p>Pretty easy. Now if someone clones that repository they will get exactly <p>Pretty easy. Now if someone clones that repository they will get exactly
what I have committed and all of it's history.</p> what I have committed and all of its history.</p>
<p>What if I have a topic branch like the 'erlang' branch we created earlier <p>What if I have a topic branch like the 'erlang' branch we created earlier
and I just want to share that? You can just push that branch instead. and I just want to share that? You can just push that branch instead.
@ -296,7 +296,7 @@ To git@github.com:schacon/hw.git
* [new branch] erlang -> erlang * [new branch] erlang -> erlang
</pre> </pre>
<p>Now when people clone or fetch from that repository, they'll get a 'erlang' <p>Now when people clone or fetch from that repository, they'll get an 'erlang'
branch they can look at and merge from. You can push any branch to any branch they can look at and merge from. You can push any branch to any
remote repository that you have write access to in this way. If your branch remote repository that you have write access to in this way. If your branch
is already on the server, it will try to update it, if it is not, Git will is already on the server, it will try to update it, if it is not, Git will
@ -307,7 +307,7 @@ To git@github.com:schacon/hw.git
at the same time, you both do commits, then she pushes and then you try to at the same time, you both do commits, then she pushes and then you try to
push, Git will by default not allow you to overwrite her changes. Instead, push, Git will by default not allow you to overwrite her changes. Instead,
it basically runs <code>git log</code> on the branch you're trying to push and it basically runs <code>git log</code> on the branch you're trying to push and
makes sure it can see the current tip of the servers branch in your pushes makes sure it can see the current tip of the server's branch in your push's
history. If it can't see what is on the server in your history, it concludes history. If it can't see what is on the server in your history, it concludes
that you are out of date and will reject your push. You will rightly have to that you are out of date and will reject your push. You will rightly have to
fetch, merge then push again - which makes sure you take her changes into fetch, merge then push again - which makes sure you take her changes into