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

Merge pull request #18 from mashingan/git-reference

Browse Source
This commit is contained in:
Scott Chacon 2010-12-28 21:53:49 -08:00
commit db14629f87
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basic/index.html
View File

@ -106,7 +106,7 @@ layout: reference
last added it. This means that if we commit our snapshot right now, we will
be recording the version of the file when we last ran <code>git add</code>,
not the version that is on our disk. Git does not assume that what the file
looks like on disk is neccesarily what you want to snapshot - you have to
looks like on disk is necessarily what you want to snapshot - you have to
tell Git with the <code>git add</code> command.
</p>

4
inspect/index.html
View File

@ -40,7 +40,7 @@ layout: reference
<div class="block">
<p>We've already seen how to use <code>git log</code> to compare branches,
by looking at the commits on one branch that are not reachable from another.
(If you don't remember, it looks like this: <code>git log branchA ^branchB</code>.
(If you don't remember, it looks like this: <code>git log branchA ^branchB</code>).
However, you can also use <code>git log</code> to look for specific commits.
Here we'll be looking at some of the more commonly used <code>git log</code>
options, but there are many. Take a look at the official docs for the whole
@ -368,7 +368,7 @@ index bb86f00..192151c 100644
2 files changed, 3 insertions(+), 3 deletions(-)
</pre>
<p>To compare two divergant branches, however, you can run something like
<p>To compare two divergent branches, however, you can run something like
<code>git diff branchA branchB</code> but the problem is that it will do
exactly what you are asking - it will basically give you a patch file that
would turn the snapshot at the tip of branchA into the snapshot at the tip

2
remotes/index.html
View File

@ -190,7 +190,7 @@ github git@github.com:schacon/hw.git (push)
<p>The second command that will fetch down new data from a remote server is
<code>git pull</code>. This command will basically run a <code>git fetch</code>
immediately follwed by a <code>git merge</code> of the branch on that remote
immediately followed by a <code>git merge</code> of the branch on that remote
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>
seperately. Less magic, less problems. However, if you like this idea, you