diff: add option to show context between close hunks

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 578bdb7850a1d661ccb85f9da71071106e6b3bff..8277577a6f896f019793382735a8c0f4a6d5e1c3 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -30,7 +30,7 @@ OPTIONS
 -------
 <rev>::
        Arbitrary extended SHA1 expression (see linkgit:git-rev-parse[1])
-       that typically names a branch HEAD or a tag.
+       that typically names a branch head or a tag.
 
 <glob>::
        A glob pattern that matches branch or tag names under
@@ -75,7 +75,7 @@ OPTIONS
 
 --merge-base::
        Instead of showing the commit list, just act like the
-       `git-merge-base -a` command, except that it can accept
+       'git-merge-base -a' command, except that it can accept
        more than two heads.
 
 --independent::
@@ -172,7 +172,7 @@ only the primary branches.  In addition, if you happen to be on
 your topic branch, it is shown as well.
 
 ------------
-$ git show-branch --reflog='10,1 hour ago' --list master
+$ git show-branch --reflog="10,1 hour ago" --list master
 ------------
 
 shows 10 reflog entries going back from the tip as of 1 hour ago.
@@ -182,7 +182,7 @@ topologically related with each other.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 
 Documentation