Merge commit 'origin/master'

schacon · schacon · commit b393caa5c406 · 2009-02-07T07:38:48.000-08:00
diff --git a/text/28_Finding_Issues_Git_Blame/0_ Finding_Issues_Git_Blame.markdown b/text/28_Finding_Issues_Git_Blame/0_ Finding_Issues_Git_Blame.markdown
@@ -1,6 +1,6 @@
 ## Finding Issues - Git Blame ##
 
-The linkto:git-blame[1] command is really helpful for figuring out who changed
+The linkgit:git-blame[1] command is really helpful for figuring out who changed
 which sections of a file.  If you simple run 'git blame [filename]' you'll get
 an output of the entire file with the last commit sha, date and author for every
 line in the file.
diff --git a/text/29_Git_and_Email_Am_Format_Patch/0_ Git_and_Email_Am_Format.markdown b/text/29_Git_and_Email_Am_Format_Patch/0_ Git_and_Email_Am_Format.markdown
@@ -29,8 +29,7 @@ single mailbox file, say "patches.mbox", then run
     $ git am -3 patches.mbox
 
 Git will apply each patch in order; if any conflicts are found, it
-will stop, and you can fix the conflicts as described in
-"<<resolving-a-merge,Resolving a merge>>".  (The "-3" option tells
+will stop, and you can fix the conflicts.  (The "-3" option tells
 git to perform a merge; if you would prefer it just to abort and
 leave your tree and index untouched, you may omit that option.)
 
