Soon Van 
							
						 
					 
					
						
						
							
						
						9fdf0b2221 
					 
					
						
						
							
							Drop in two other examples of git reset  
						
						 
						
						... 
						
						
						
						Fleshing out what the other two invocations of `git reset`
are and bundle them up.
Information based on the following resources:
http://git-scm.com/2011/07/11/reset.html 
http://www.infoq.com/presentations/A-Tale-of-Three-Trees 
http://schacon.github.com/resetvcheckout.html 
Also updates a link to the book no longer at ProGit.org 
						
						
					 
					
						2012-12-11 17:20:47 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Soon Van 
							
						 
					 
					
						
						
							
						
						3de81653fa 
					 
					
						
						
							
							Update progit.org links to git-scm.com book version  
						
						 
						
						... 
						
						
						
						Quickening event to redirect the links that used to be at progit.org
to their new home at the git-scm.com book section.
Deals with the English language links only. 
						
						
					 
					
						2012-12-03 22:56:49 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						b4179f8609 
					 
					
						
						
							
							Merge pull request  #45  from dotnil/gh-pages  
						
						 
						
						... 
						
						
						
						Use normal you (你) instead of honorific you (您) 
						
						
					 
					
						2012-11-29 07:20:19 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dotnil 
							
						 
					 
					
						
						
							
						
						338456b8b4 
					 
					
						
						
							
							Revert these changes to original  
						
						 
						
						... 
						
						
						
						stop bragging about yourself, dotnil. 
						
						
					 
					
						2012-11-29 20:27:14 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dotnil 
							
						 
					 
					
						
						
							
						
						0f4505c1e2 
					 
					
						
						
							
							Indent with two spaces in zh files  
						
						 
						
						... 
						
						
						
						converted tabs to spaces also. but these commits is limited in the zh
version.
the reason I did this:
 - long lines is prone to conflict
 - the use of tab disturbs the indentation when switching editors
   without proper tab space setting, which you may never get it right.
   so why not give up and use spaces instead.
those changes is limited to the zh translation.
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Conflicts:
	.gitignore
	_layouts/zh_reference.html
	zh/basic/index.html
	zh/branching/index.html
	zh/creating/index.html
	zh/index.html
	zh/inspect/index.html
	zh/remotes/index.html 
						
						
					 
					
						2012-11-29 20:16:37 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dotnil 
							
						 
					 
					
						
						
							
						
						b7cefc43bf 
					 
					
						
						
							
							Changed 您 to 你  
						
						 
						
						... 
						
						
						
						do not use the honorific version of `you' in chinese.
indeed that was weird... 
						
						
					 
					
						2012-11-29 19:29:33 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						b46838f701 
					 
					
						
						
							
							Added CC BY-NC-SA 3.0 license.  
						
						 
						
						... 
						
						
						
						* License added
* Chose Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)
* Desire community to benefit, but not profit off this endeavor
* Fixes  #44  
						
						
					 
					
						2012-11-21 11:02:06 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						8cdd611601 
					 
					
						
						
							
							Normalized styles with GitHub.com for code and training.github.com for Sans-Serif  
						
						 
						
						
						
						
					 
					
						2012-10-01 15:17:55 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						395077b8e9 
					 
					
						
						
							
							Removing execute bit from CSS files (unnecessary)  
						
						 
						
						
						
						
					 
					
						2012-10-01 15:06:06 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						cc75e98bd5 
					 
					
						
						
							
							Matching colors to the training.github.com site  
						
						 
						
						
						
						
					 
					
						2012-10-01 14:50:32 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						f1e74cb76a 
					 
					
						
						
							
							Restoring CNAME to gitref.org domain name after accidental merge pointed it to cyj.me domain  
						
						 
						
						
						
						
					 
					
						2012-10-01 14:29:20 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						8ff0637a5c 
					 
					
						
						
							
							Remotes and links updated to reflect that GitHub as the owning organization  
						
						 
						
						
						
						
					 
					
						2012-10-01 14:28:19 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						8831b158b1 
					 
					
						
						
							
							Merge pull request  #23  from mcastner/master  
						
						 
						
						... 
						
						
						
						Slight usability change. Buttons are now CSS-styled arrows. 
						
						
					 
					
						2012-10-01 09:27:12 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						f381994ef2 
					 
					
						
						
							
							Replaces broken Kernel.org links with git-scm links.  Fixes   #30  
						
						 
						
						
						
						
					 
					
						2012-10-01 10:25:17 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						7c129b0083 
					 
					
						
						
							
							Merge pull request  #25  from mikelehen/master  
						
						 
						
						... 
						
						
						
						Note about ^ for windows command-line users and a typo fix. 
						
						
					 
					
						2012-10-01 09:17:15 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						6906a995d1 
					 
					
						
						
							
							Ignore swap files and .DS_Stores  
						
						 
						
						
						
						
					 
					
						2012-10-01 10:14:45 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jake Chen 
							
						 
					 
					
						
						
							
						
						5dea510cea 
					 
					
						
						
							
							忽视 Vim swap files  
						
						 
						
						
						
						
					 
					
						2012-10-01 10:14:20 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jake Chen 
							
						 
					 
					
						
						
							
						
						9ac90d9106 
					 
					
						
						
							
							github might require a push to remind itself that there's a gh-pages branch  
						
						 
						
						... 
						
						
						
						let's see if this will work 
						
						
					 
					
						2012-10-01 10:14:20 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yicai 
							
						 
					 
					
						
						
							
						
						b4085899c7 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2012-10-01 10:14:19 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yicai 
							
						 
					 
					
						
						
							
						
						5baac9cfcb 
					 
					
						
						
							
							fix typo; ignore .DS_Store  
						
						 
						
						
						
						
					 
					
						2012-10-01 10:14:19 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yicai 
							
						 
					 
					
						
						
							
						
						79ba115ffb 
					 
					
						
						
							
							git repo link fix  
						
						 
						
						
						
						
					 
					
						2012-10-01 10:13:33 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yicai 
							
						 
					 
					
						
						
							
						
						35d6a3e6c6 
					 
					
						
						
							
							1) do not track vim swap files; 2) stylesheet link href fix  
						
						 
						
						
						
						
					 
					
						2012-10-01 10:09:55 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						44c772fd7e 
					 
					
						
						
							
							Merge pull request  #31  from dstine/master  
						
						 
						
						... 
						
						
						
						fixing a typo 
						
						
					 
					
						2012-10-01 08:53:46 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						f02d5d9a13 
					 
					
						
						
							
							Merge pull request  #32  from hrhristov/patch-1  
						
						 
						
						... 
						
						
						
						fix typo on the main page 
						
						
					 
					
						2012-10-01 08:52:10 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						e3519eff00 
					 
					
						
						
							
							Merge pull request  #33  from CzBiX/fixed  
						
						 
						
						... 
						
						
						
						fix typo 
						
						
					 
					
						2012-10-01 08:50:25 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						c8e4eebe4c 
					 
					
						
						
							
							Merge pull request  #34  from bulldy80/master  
						
						 
						
						... 
						
						
						
						erroneous status line 
						
						
					 
					
						2012-10-01 08:49:32 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						6bc3fa3167 
					 
					
						
						
							
							Merge pull request  #35  from freshtonic/master  
						
						 
						
						... 
						
						
						
						Fix documentation for git log --since --authored 
						
						
					 
					
						2012-10-01 08:48:01 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						c717a47e36 
					 
					
						
						
							
							Merge pull request  #38  from pkufranky/master  
						
						 
						
						... 
						
						
						
						Fix broken links in zh layout 
						
						
					 
					
						2012-10-01 08:47:16 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						2af3530cb8 
					 
					
						
						
							
							Merge pull request  #39  from jrguenther/master  
						
						 
						
						... 
						
						
						
						Fixed docs links to point to git-scm.com/docs 
						
						
					 
					
						2012-10-01 08:46:07 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matthew McCullough 
							
						 
					 
					
						
						
							
						
						bebd97890d 
					 
					
						
						
							
							Merge pull request  #40  from mhenke/patch-1  
						
						 
						
						... 
						
						
						
						change to & 
						
						
					 
					
						2012-10-01 08:43:40 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jake Chen 
							
						 
					 
					
						
						
							
						
						0fd9c64462 
					 
					
						
						
							
							Updated README  
						
						 
						
						
						
						
					 
					
						2012-08-16 12:02:22 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Henke 
							
						 
					 
					
						
						
							
						
						c2b5d2d0ca 
					 
					
						
						
							
							change to &  
						
						 
						
						
						
						
					 
					
						2012-05-18 13:43:56 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffrey Guenther 
							
						 
					 
					
						
						
							
						
						629b181421 
					 
					
						
						
							
							Fixed docs links to point to git-scm/docs  
						
						 
						
						
						
						
					 
					
						2012-05-15 22:09:16 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffrey Guenther 
							
						 
					 
					
						
						
							
						
						ea759dbf93 
					 
					
						
						
							
							Fixed docs links to link to git-scm/docs  
						
						 
						
						
						
						
					 
					
						2012-05-15 22:06:49 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffrey Guenther 
							
						 
					 
					
						
						
							
						
						f7fb27242b 
					 
					
						
						
							
							Fixed links to refer to git-scm docs  
						
						 
						
						
						
						
					 
					
						2012-05-15 22:02:49 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffrey Guenther 
							
						 
					 
					
						
						
							
						
						7fa5d14fcb 
					 
					
						
						
							
							Fixed docs link to link to git-scm/docs pages  
						
						 
						
						
						
						
					 
					
						2012-05-15 21:59:36 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ping Yin 
							
						 
					 
					
						
						
							
						
						c3164a32f7 
					 
					
						
						
							
							Fix broken links in zh layout  
						
						 
						
						
						
						
					 
					
						2012-04-14 20:36:41 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Sadler 
							
						 
					 
					
						
						
							
						
						d65f630d79 
					 
					
						
						
							
							Correct the doc for git log --since --before  
						
						 
						
						... 
						
						
						
						"By default, “git log” displays author dates as “Date” but then uses commit
dates when given a –since option. That seems like broken defaults to me."
    - http://www.alexpeattie.com/blog/working-with-dates-in-git/ 
 filter commits by date authored
should be
 filter commits by date committed 
						
						
					 
					
						2012-04-10 12:11:08 +10:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Shezan Baig 
							
						 
					 
					
						
						
							
						
						571b99207c 
					 
					
						
						
							
							remove erroneous status line for hello.rb  
						
						 
						
						
						
						
					 
					
						2012-04-04 19:23:34 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jake Chen 
							
						 
					 
					
						
						
							
						
						987140dea0 
					 
					
						
						
							
							测试重新 push 一下 github 会否更新  
						
						 
						
						
						
						
					 
					
						2012-02-29 16:24:52 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								CzBiX 
							
						 
					 
					
						
						
							
						
						5d4495f013 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2012-02-19 23:17:00 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hristo Hristov 
							
						 
					 
					
						
						
							
						
						d9f8826bed 
					 
					
						
						
							
							fix typo on the main page  
						
						 
						
						
						
						
					 
					
						2012-01-16 13:41:14 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dstine 
							
						 
					 
					
						
						
							
						
						edadb62104 
					 
					
						
						
							
							fixed typo  
						
						 
						
						
						
						
					 
					
						2011-12-14 15:30:05 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott Chacon 
							
						 
					 
					
						
						
							
						
						e1d7000be0 
					 
					
						
						
							
							Merge pull request  #28  from Nilhcem/master  
						
						 
						
						... 
						
						
						
						Tiny typo 
						
						
					 
					
						2011-09-21 07:35:11 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gautier Nilhcem 
							
						 
					 
					
						
						
							
						
						0ff60161a0 
					 
					
						
						
							
							Typo fixing  
						
						 
						
						
						
						
					 
					
						2011-09-21 20:10:13 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jake Chen 
							
						 
					 
					
						
						
							
						
						b7e5805b3c 
					 
					
						
						
							
							github might require a push to remind itself that there's a gh-pages branch  
						
						 
						
						... 
						
						
						
						let's see if this will work 
						
						
					 
					
						2011-07-12 10:33:44 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yicai 
							
						 
					 
					
						
						
							
						
						2551dcc334 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2011-04-26 16:06:58 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yicai 
							
						 
					 
					
						
						
							
						
						14a6ebda0f 
					 
					
						
						
							
							fix typo; ignore .DS_Store  
						
						 
						
						
						
						
					 
					
						2011-04-23 16:21:07 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yicai 
							
						 
					 
					
						
						
							
						
						ffaf6091b1 
					 
					
						
						
							
							git repo link change back to upstream  
						
						 
						
						
						
						
					 
					
						2011-04-11 09:44:43 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yicai 
							
						 
					 
					
						
						
							
						
						b4c9d9db8c 
					 
					
						
						
							
							git repo link fix  
						
						 
						
						
						
						
					 
					
						2011-04-11 09:38:45 +08:00