Merge branch 'master' into korean

marocchino · marocchino · commit 00c1a2399fb3 · 2014-04-20T16:19:00.000+09:00
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@ A collection of cool hidden and not so hidden features of Git and GitHub. This c
 ## Table of Contents
  - [GitHub](#github)
   - [Ignore Whitespace](#ignore-whitespace)
+  - [Adjust Tab Space](#adjust-tab-space)
   - [Commit History by Author](#commit-history-by-author)
   - [Cloning a Repository](#cloning-a-repository)
   - [Comparing Branches](#comparing-branches)
@@ -61,6 +62,17 @@ Adding `?w=1` to any diff URL will remove any changes only in whitespace, enabli
 
 [*Read more about GitHub secrets.*](https://github.com/blog/967-github-secrets)
 
+### Adjust Tab Space
+Adding `?ts=4` to a diff or file URL will display tab characters as 4 spaces wide instead of the default 8. The number after `ts` can be adjusted to suit your preference. This does not work on Gists, or raw file views.
+
+Here is a Go source file [before](https://github.com/pengwynn/flint/blob/master/flint/flint.go) adding `?ts=4`:
+
+![Before, tab space example](http://i.imgur.com/GIT1Fr0.png)
+
+...and this is [after](https://github.com/pengwynn/flint/blob/master/flint/flint.go?ts=4) adding `?ts=4`:
+
+![After, tab space example](http://i.imgur.com/70FL4H9.png)
+
 ### Commit History by Author
 To view all commits on a repo by author add `?author=username` to the URL.
 
@@ -594,7 +606,7 @@ A Git query allows you to search all your previous commit messages and find the
 $ git show :/query
 ```
 
-Where `query` is the term you want to search, this then finds the last one and gives details on the lines that were changed.
+Where `query` (case-sensitive) is the term you want to search, this then finds the last one and gives details on the lines that were changed.
 
 ```bash
 $ git show :/typo
