From 7fa5d14fcb9660cc6810c8ef51f367eda671208c Mon Sep 17 00:00:00 2001 From: Jeffrey Guenther Date: Tue, 15 May 2012 21:59:36 -0700 Subject: [PATCH 1/4] Fixed docs link to link to git-scm/docs pages --- creating/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/creating/index.html b/creating/index.html index eebacd3..78c3127 100644 --- a/creating/index.html +++ b/creating/index.html @@ -23,7 +23,7 @@ layout: reference

- docs   + docs   book git init @@ -74,7 +74,7 @@ Initialized empty Git repository in /opt/konichiwa/.git/

- docs   + docs   book git clone From f7fb27242bc3087403815f24defd6ad09a6b2ec9 Mon Sep 17 00:00:00 2001 From: Jeffrey Guenther Date: Tue, 15 May 2012 22:02:49 -0700 Subject: [PATCH 2/4] Fixed links to refer to git-scm docs --- basic/index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/basic/index.html b/basic/index.html index 4f8327b..9f4b47e 100644 --- a/basic/index.html +++ b/basic/index.html @@ -38,7 +38,7 @@ layout: reference

- docs   + docs   book git add @@ -130,7 +130,7 @@ layout: reference

- docs   + docs   book git status @@ -214,7 +214,7 @@ layout: reference

- docs   + docs   book git diff @@ -416,7 +416,7 @@ index 2aabb6e..2ae9ba4 100644

- docs   + docs   book git commit @@ -596,7 +596,7 @@ Further paragraphs come after blank lines.

- docs   + docs   book git reset HEAD @@ -694,7 +694,7 @@ M hello.rb

- docs   + docs   book git rm From ea759dbf93636d2c148b929b0974450885f7689f Mon Sep 17 00:00:00 2001 From: Jeffrey Guenther Date: Tue, 15 May 2012 22:06:49 -0700 Subject: [PATCH 3/4] Fixed docs links to link to git-scm/docs --- branching/index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/branching/index.html b/branching/index.html index 21ca658..ce5bc3f 100644 --- a/branching/index.html +++ b/branching/index.html @@ -38,7 +38,7 @@ layout: reference

- docs   + docs   book git branch @@ -49,7 +49,7 @@ layout: reference

- docs   + docs   book git checkout @@ -226,7 +226,7 @@ Deleted branch testing (was 78b2670).

- docs   + docs   book git merge @@ -421,7 +421,7 @@ nearly every programming language.

You can see that Git inserts standard merge conflict markers, much like Subversion, into files when it gets a merge conflict. Now it's up to us to resolve them. We will do it manually here, but check out - git mergetool + git mergetool if you want Git to fire up a graphical mergetool (like kdiff3, emerge, p4merge, etc) instead.

@@ -473,7 +473,7 @@ M README

- docs   + docs   book git log @@ -693,7 +693,7 @@ ab5ab4c added erlang

- docs   + docs   book git tag From 629b181421e8b90aef4a3f529e3f0fa8cdae7295 Mon Sep 17 00:00:00 2001 From: Jeffrey Guenther Date: Tue, 15 May 2012 22:09:16 -0700 Subject: [PATCH 4/4] Fixed docs links to point to git-scm/docs --- inspect/index.html | 4 ++-- remotes/index.html | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inspect/index.html b/inspect/index.html index c8b3f48..c882b52 100644 --- a/inspect/index.html +++ b/inspect/index.html @@ -30,7 +30,7 @@ layout: reference

- docs   + docs   book git log @@ -309,7 +309,7 @@ Date: Fri Jun 4 12:58:53 2010 +0200

- docs   + docs   book git diff diff --git a/remotes/index.html b/remotes/index.html index 403e6cf..a3487c2 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -43,7 +43,7 @@ layout: reference

- docs   + docs   book git remote @@ -159,7 +159,7 @@ github git@github.com:schacon/hw.git (push)

- docs   + docs   book git fetch @@ -170,7 +170,7 @@ github git@github.com:schacon/hw.git (push)

- docs   + docs   book git pull @@ -195,7 +195,7 @@ github git@github.com:schacon/hw.git (push) like this command - I prefer running fetch and merge separately. Less magic, less problems. However, if you like this idea, you can read about it in more detail in the - official docs. + official docs.

Assuming you have a remote all set up and you want to pull in updates, you @@ -254,7 +254,7 @@ From github.com:schacon/hw

- docs   + docs   book git push