fixed some broken links and added an initial git blame section

schacon · schacon · commit bd6d2c876e9b · 2008-09-02T15:22:28.000-07:00
diff --git a/text/12a_Ignoring_Files/0_Ignoring_Files.markdown b/text/12a_Ignoring_Files/0_Ignoring_Files.markdown
@@ -24,8 +24,8 @@ in the top level of your working directory, with contents such as:
 See linkgit:gitignore[5] for a detailed explanation of the syntax.  You can
 also place .gitignore files in other directories in your working tree, and they
 will apply to those directories and their subdirectories.  The `.gitignore`
-files can be added to your repository like any other files (just run `git add
-.gitignore` and `git commit`, as usual), which is convenient when the exclude
+files can be added to your repository like any other files 
+(just run `git add .gitignore` and `git commit`, as usual), which is convenient when the exclude
 patterns (such as patterns matching build output files) would also make sense
 for other users who clone your repository.
 
diff --git a/text/21_Redoing_Git_Reset_and_Revert/0_ Redoing_Git_Reset_and_Revert.markdown b/text/21_Redoing_Git_Reset_and_Revert/0_ Redoing_Git_Reset_and_Revert.markdown
@@ -63,8 +63,7 @@ You can also revert an earlier change, for example, the next-to-last:
 In this case git will attempt to undo the old change while leaving
 intact any changes made since then.  If more recent changes overlap
 with the changes to be reverted, then you will be asked to fix
-conflicts manually, just as in the case of <<resolving-a-merge,
-resolving a merge>>.
+conflicts manually, just as in the case of resolving a merge.
 
 #### Fixing a mistake by modifying a commit ####
 
diff --git a/text/22_Maintaining_Git_Gc_Prune_Fsck/0_ Maintaining_Git_Gc_Prune_Fsck.markdown b/text/22_Maintaining_Git_Gc_Prune_Fsck/0_ Maintaining_Git_Gc_Prune_Fsck.markdown
@@ -33,4 +33,4 @@ time.  The most common warning by far is about "dangling" objects:
 
 Dangling objects are not a problem.  At worst they may take up a little
 extra disk space.  They can sometimes provide a last-resort method for
-recovering lost work--see <<dangling-objects>> for details.
+recovering lost work.
diff --git a/text/23_Setting_Up_A_Public_Repo_Git_Http_Ssh_Gitosis/0_ Setting_Up_A_Public_Repo.markdown b/text/23_Setting_Up_A_Public_Repo_Git_Http_Ssh_Gitosis/0_ Setting_Up_A_Public_Repo.markdown
@@ -21,9 +21,7 @@ This is the preferred method.
 
 If someone else administers the server, they should tell you what
 directory to put the repository in, and what git:// URL it will appear
-at.  You can then skip to the section
-"<<pushing-changes-to-a-public-repository,Pushing changes to a public
-repository>>", below.
+at.
 
 Otherwise, all you need to do is start linkgit:git-daemon[1]; it will
 listen on port 9418.  By default, it will allow access to any directory
@@ -56,10 +54,3 @@ Advertise the URL of proj.git.  Anybody else should then be able to
 clone or pull from that URL, for example with a command line like:
 
     $ git clone http://yourserver.com/~you/proj.git
-
-(See also
-link:howto/setup-git-server-over-http.txt[setup-git-server-over-http]
-for a slightly more sophisticated setup using WebDAV which also
-allows pushing over http.)
-
-(!!gitosis!!)
diff --git a/text/24_Creating_New_Empty_Branches/0_ Creating_New_Empty_Branches.markdown b/text/24_Creating_New_Empty_Branches/0_ Creating_New_Empty_Branches.markdown
@@ -1,5 +1,10 @@
 ## Creating New Empty Branches ##
 
+Ocasionally, you may want to keep branches in your repository that do not
+share an ancestor with your normal code.  Some examples of this might be
+generated documentation or something along those lines.  If you want to 
+create a new branch head that does not use your current codebase as a 
+parent, you can create an empty branch like this:
 
     git symbolic-ref HEAD refs/heads/newbranch 
     rm .git/index 
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,2 +1,37 @@
 ## Finding Issues - Git Blame ##
 
+The linkto: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.
+
+	$ git blame sha1_file.c
+	...
+	0fcfd160 (Linus Torvalds  2005-04-18 13:04:43 -0700    8)  */
+	0fcfd160 (Linus Torvalds  2005-04-18 13:04:43 -0700    9) #include "cache.h"
+	1f688557 (Junio C Hamano  2005-06-27 03:35:33 -0700   10) #include "delta.h"
+	a733cb60 (Linus Torvalds  2005-06-28 14:21:02 -0700   11) #include "pack.h"
+	8e440259 (Peter Eriksen   2006-04-02 14:44:09 +0200   12) #include "blob.h"
+	8e440259 (Peter Eriksen   2006-04-02 14:44:09 +0200   13) #include "commit.h"
+	8e440259 (Peter Eriksen   2006-04-02 14:44:09 +0200   14) #include "tag.h"
+	8e440259 (Peter Eriksen   2006-04-02 14:44:09 +0200   15) #include "tree.h"
+	f35a6d3b (Linus Torvalds  2007-04-09 21:20:29 -0700   16) #include "refs.h"70f5d5d3 (Nicolas Pitre               2008-02-28 00:25:19 -0500   17) #include "pack-revindex.h"628522ec (Junio C Hamano              2007-12-29 02:05:47 -0800   18) #include "sha1-lookup.h"
+	...
+	
+This is often helpful if a file had a line reverted or a mistake that broke 
+the build to help you see who changed that line last.  
+
+You can also specify a start and end line for the blame:
+
+	$>git annotate -L 160,+10 sha1_file.c 
+	ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700       160)}
+	ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700       161)
+	0fcfd160 (Linus Torvalds 2005-04-18 13:04:43 -0700       162)/*
+	0fcfd160 (Linus Torvalds 2005-04-18 13:04:43 -0700       163) * NOTE! This returns a statically allocate
+	790296fd (Jim Meyering   2008-01-03 15:18:07 +0100       164) * careful about using it. Do an "xstrdup()
+	0fcfd160 (Linus Torvalds 2005-04-18 13:04:43 -0700       165) * filename.
+	ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700       166) *
+	ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700       167) * Also note that this returns the location
+	ace1534d (Junio C Hamano 2005-05-07 00:38:04 -0700       168) * SHA1 file can happen from any alternate 
+	d19938ab (Junio C Hamano 2005-05-09 17:57:56 -0700       169) * DB_ENVIRONMENT environment variable if i
+	
