From ea0af0c391360896c84a9cbb93260918b6227f7f Mon Sep 17 00:00:00 2001
From: Nicolai Skogheim <nicolai.skogheim@gmail.com>
Date: Thu, 6 Aug 2015 03:48:15 +0200
Subject: [PATCH 1/4] guilt: Adds simplified example

---
 man/git-guilt.1    |  8 +++++++-
 man/git-guilt.html | 10 +++++++---
 man/git-guilt.md   |  4 ++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/man/git-guilt.1 b/man/git-guilt.1
index 9baee48..cea3ad3 100644
--- a/man/git-guilt.1
+++ b/man/git-guilt.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-GUILT" "1" "April 2015" "" ""
+.TH "GIT\-GUILT" "1" "August 2015" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-guilt\fR \- calculate change between two revisions
@@ -74,6 +74,12 @@ hemanth\.hm                    \-\-
 .IP "" 0
 .
 .P
+Since git 1\.8\.5, the above can also be written as:
+.
+.P
+$ git guilt @{3\.weeks\.ago}
+.
+.P
 Find blame delta for a topic branch:
 .
 .IP "" 4
diff --git a/man/git-guilt.html b/man/git-guilt.html
index 48ee165..753ca35 100644
--- a/man/git-guilt.html
+++ b/man/git-guilt.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-guilt(1)</li>
-    <li class='tc'></li>
+    <li class='tc'>Git Extras</li>
     <li class='tr'>git-guilt(1)</li>
   </ol>
 
@@ -123,6 +123,10 @@ Ben Parnell                   -
 hemanth.hm                    --
 </code></pre>
 
+<p>Since git 1.8.5, the above can also be written as:</p>
+
+<p>  $ git guilt @{3.weeks.ago}</p>
+
 <p>Find blame delta for a topic branch:</p>
 
 <pre><code>$ git guilt `git merge-base master git-guilt` git-guilt 
@@ -131,7 +135,7 @@ spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(112)
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by spacewander &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#x73;&#112;&#x61;&#x63;&#101;&#x77;&#x61;&#110;&#x64;&#x65;&#114;&#x6c;&#122;&#x78;&#x40;&#x67;&#x6d;&#x61;&#x69;&#x6c;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#115;&#112;&#x61;&#x63;&#101;&#x77;&#97;&#110;&#x64;&#x65;&#x72;&#x6c;&#122;&#120;&#x40;&#x67;&#x6d;&#x61;&#105;&#108;&#x2e;&#99;&#x6f;&#109;</a>&gt;</p>
+<p>Written by spacewander &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#x3a;&#x73;&#x70;&#97;&#99;&#x65;&#x77;&#x61;&#x6e;&#x64;&#101;&#x72;&#108;&#x7a;&#x78;&#64;&#103;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#115;&#112;&#x61;&#99;&#x65;&#x77;&#x61;&#x6e;&#x64;&#x65;&#x72;&#108;&#122;&#120;&#x40;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -144,7 +148,7 @@ spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(112)
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>August 2015</li>
     <li class='tr'>git-guilt(1)</li>
   </ol>
 
diff --git a/man/git-guilt.md b/man/git-guilt.md
index ada6bdf..5a72808 100644
--- a/man/git-guilt.md
+++ b/man/git-guilt.md
@@ -48,6 +48,10 @@ Find blame delta over the last three weeks:
     Ben Parnell                   -
     hemanth.hm                    --
 
+Since git 1.8.5, the above can also be written as:
+
+  $ git guilt @{3.weeks.ago}
+
 Find blame delta for a topic branch:
 
     $ git guilt `git merge-base master git-guilt` git-guilt 

From a212a78c1b6f2b33dd6eca2b477ea764fefcf693 Mon Sep 17 00:00:00 2001
From: Nicolai Skogheim <nicolai.skogheim@gmail.com>
Date: Thu, 6 Aug 2015 04:20:06 +0200
Subject: [PATCH 2/4] guilt docs: Capitalize letters

---
 man/git-guilt.1    | 10 +++++-----
 man/git-guilt.html | 12 ++++++------
 man/git-guilt.md   | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/man/git-guilt.1 b/man/git-guilt.1
index cea3ad3..2a26494 100644
--- a/man/git-guilt.1
+++ b/man/git-guilt.1
@@ -10,31 +10,31 @@
 git guilt [<option>] <since> <until>
 .
 .SH "DESCRIPTION"
-calculate the change in blame between two revisions
+Calculate the change in blame between two revisions
 .
 .SH "OPTIONS"
 \-h, \-\-help
 .
 .P
-output usage information
+Output usage information
 .
 .P
 \-e, \-\-email
 .
 .P
-display author emails instead of names
+Display author emails instead of names
 .
 .P
 \-w, \-\-ignore\-whitespace
 .
 .P
-ignore whitespace only changes when attributing blame
+Ignore whitespace only changes when attributing blame
 .
 .P
 \-d, \-\-debug
 .
 .P
-output debug information
+Output debug information
 .
 .SH "Examples"
 Find blame delta between two commits:
diff --git a/man/git-guilt.html b/man/git-guilt.html
index 753ca35..1ecb829 100644
--- a/man/git-guilt.html
+++ b/man/git-guilt.html
@@ -80,25 +80,25 @@
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>calculate the change in blame between two revisions</p>
+<p>Calculate the change in blame between two revisions</p>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
 <p>  -h, --help</p>
 
-<p>  output usage information</p>
+<p>  Output usage information</p>
 
 <p>  -e, --email</p>
 
-<p>  display author emails instead of names</p>
+<p>  Display author emails instead of names</p>
 
 <p>  -w, --ignore-whitespace</p>
 
-<p>  ignore whitespace only changes when attributing blame</p>
+<p>  Ignore whitespace only changes when attributing blame</p>
 
 <p>  -d, --debug</p>
 
-<p>  output debug information</p>
+<p>  Output debug information</p>
 
 <h2 id="Examples">Examples</h2>
 
@@ -135,7 +135,7 @@ spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(112)
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by spacewander &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#x3a;&#x73;&#x70;&#97;&#99;&#x65;&#x77;&#x61;&#x6e;&#x64;&#101;&#x72;&#108;&#x7a;&#x78;&#64;&#103;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#115;&#112;&#x61;&#99;&#x65;&#x77;&#x61;&#x6e;&#x64;&#x65;&#x72;&#108;&#122;&#120;&#x40;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
+<p>Written by spacewander &lt;<a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#58;&#115;&#x70;&#x61;&#x63;&#101;&#x77;&#97;&#110;&#100;&#101;&#x72;&#x6c;&#x7a;&#120;&#64;&#x67;&#109;&#97;&#x69;&#108;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x73;&#112;&#x61;&#x63;&#101;&#119;&#97;&#x6e;&#x64;&#x65;&#114;&#108;&#122;&#120;&#64;&#x67;&#x6d;&#x61;&#105;&#108;&#x2e;&#99;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
diff --git a/man/git-guilt.md b/man/git-guilt.md
index 5a72808..2848419 100644
--- a/man/git-guilt.md
+++ b/man/git-guilt.md
@@ -7,25 +7,25 @@ git guilt [&lt;option&gt;] &lt;since&gt; &lt;until&gt;
 
 ## DESCRIPTION
 
-calculate the change in blame between two revisions
+Calculate the change in blame between two revisions
 
 ## OPTIONS
 
   -h, --help
 
-  output usage information
+  Output usage information
 
   -e, --email
 
-  display author emails instead of names
+  Display author emails instead of names
 
   -w, --ignore-whitespace
 
-  ignore whitespace only changes when attributing blame
+  Ignore whitespace only changes when attributing blame
 
   -d, --debug
 
-  output debug information
+  Output debug information
 
 ## Examples
 

From aeebb1c1c11cfa73d53237b6cb82c1b7203bc082 Mon Sep 17 00:00:00 2001
From: Nicolai Skogheim <nicolai.skogheim@gmail.com>
Date: Thu, 6 Aug 2015 05:43:06 +0200
Subject: [PATCH 3/4] guilt: document call without arguments

---
 man/git-guilt.1    | 31 +++++++++++++++++++++++++++----
 man/git-guilt.html | 23 ++++++++++++++++++-----
 man/git-guilt.md   | 20 ++++++++++++++++----
 3 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/man/git-guilt.1 b/man/git-guilt.1
index 2a26494..0752403 100644
--- a/man/git-guilt.1
+++ b/man/git-guilt.1
@@ -7,10 +7,16 @@
 \fBgit\-guilt\fR \- calculate change between two revisions
 .
 .SH "SYNOPSIS"
-git guilt [<option>] <since> <until>
+\fBgit guilt\fR [<option>]
+.
+.br
+\fBgit guilt\fR [<option>] <since> [<until>]
 .
 .SH "DESCRIPTION"
-Calculate the change in blame between two revisions
+In the first form, shows total blame count for files with unstaged changes\.
+.
+.P
+In the second form, calculates the change in blame between two revisions\. If not specified, <until> will default to HEAD\.
 .
 .SH "OPTIONS"
 \-h, \-\-help
@@ -37,13 +43,30 @@ Ignore whitespace only changes when attributing blame
 Output debug information
 .
 .SH "Examples"
+Find blame on unstaged modified files:
+.
+.IP "" 4
+.
+.nf
+
+$ git guilt      (1)
+spacewander                   ++++
+
+(1) There is only one modified file and it is not staged\. The four
+plusses means that the file has four lines, all contributed by spacewander\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
 Find blame delta between two commits:
 .
 .IP "" 4
 .
 .nf
 
-$ git guilt HEAD~2 HEAD
+$ git guilt HEAD~3 HEAD^
 spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(115)
 Jesse Sipprell                \-
 .
@@ -58,7 +81,7 @@ Find blame delta over the last three weeks:
 .
 .nf
 
-$ git guilt `git log \-\-until="3 weeks ago" \-\-format="%H" \-n 1` HEAD
+$ git guilt `git log \-\-until="3 weeks ago" \-\-format="%H" \-n 1`
 Paul Schreiber                +++++++++++++++++++++++++++++++++++++++++++++(349)
 spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(113)
 Mark Eissler                  ++++++++++++++++++++++++++
diff --git a/man/git-guilt.html b/man/git-guilt.html
index 1ecb829..c6b7593 100644
--- a/man/git-guilt.html
+++ b/man/git-guilt.html
@@ -76,11 +76,15 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p>git guilt [&lt;option&gt;] &lt;since&gt; &lt;until&gt;</p>
+<p><code>git guilt</code> [&lt;option&gt;]<br />
+<code>git guilt</code> [&lt;option&gt;] &lt;since&gt; [&lt;until&gt;]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>Calculate the change in blame between two revisions</p>
+<p>In the first form, shows total blame count for files with unstaged changes.</p>
+
+<p>In the second form, calculates the change in blame between two revisions.
+If not specified, &lt;until&gt; will default to HEAD.</p>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
@@ -102,16 +106,25 @@
 
 <h2 id="Examples">Examples</h2>
 
+<p>Find blame on unstaged modified files:</p>
+
+<pre><code>$ git guilt      (1)
+spacewander                   ++++
+
+(1) There is only one modified file and it is not staged. The four
+plusses means that the file has four lines, all contributed by spacewander.
+</code></pre>
+
 <p>Find blame delta between two commits:</p>
 
-<pre><code>$ git guilt HEAD~2 HEAD
+<pre><code>$ git guilt HEAD~3 HEAD^
 spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(115)
 Jesse Sipprell                -
 </code></pre>
 
 <p>Find blame delta over the last three weeks:</p>
 
-<pre><code>$ git guilt `git log --until="3 weeks ago" --format="%H" -n 1` HEAD 
+<pre><code>$ git guilt `git log --until="3 weeks ago" --format="%H" -n 1`
 Paul Schreiber                +++++++++++++++++++++++++++++++++++++++++++++(349)
 spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(113)
 Mark Eissler                  ++++++++++++++++++++++++++
@@ -135,7 +148,7 @@ spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(112)
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by spacewander &lt;<a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#58;&#115;&#x70;&#x61;&#x63;&#101;&#x77;&#97;&#110;&#100;&#101;&#x72;&#x6c;&#x7a;&#120;&#64;&#x67;&#109;&#97;&#x69;&#108;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#x73;&#112;&#x61;&#x63;&#101;&#119;&#97;&#x6e;&#x64;&#x65;&#114;&#108;&#122;&#120;&#64;&#x67;&#x6d;&#x61;&#105;&#108;&#x2e;&#99;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by spacewander &lt;<a href="&#x6d;&#97;&#x69;&#108;&#x74;&#x6f;&#x3a;&#115;&#112;&#97;&#99;&#x65;&#x77;&#97;&#x6e;&#100;&#101;&#114;&#108;&#122;&#120;&#64;&#x67;&#x6d;&#x61;&#x69;&#x6c;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x73;&#112;&#97;&#x63;&#x65;&#119;&#97;&#110;&#100;&#101;&#114;&#x6c;&#122;&#120;&#x40;&#103;&#109;&#x61;&#105;&#x6c;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
diff --git a/man/git-guilt.md b/man/git-guilt.md
index 2848419..983ed1a 100644
--- a/man/git-guilt.md
+++ b/man/git-guilt.md
@@ -3,11 +3,15 @@ git-guilt(1) -- calculate change between two revisions
 
 ## SYNOPSIS
 
-git guilt [&lt;option&gt;] &lt;since&gt; &lt;until&gt;
+`git guilt` [&lt;option&gt;]<br>
+`git guilt` [&lt;option&gt;] &lt;since&gt; [&lt;until&gt;]
 
 ## DESCRIPTION
 
-Calculate the change in blame between two revisions
+In the first form, shows total blame count for files with unstaged changes.
+
+In the second form, calculates the change in blame between two revisions.
+If not specified, &lt;until&gt; will default to HEAD.
 
 ## OPTIONS
 
@@ -29,15 +33,23 @@ Calculate the change in blame between two revisions
 
 ## Examples
 
+Find blame on unstaged modified files:
+
+    $ git guilt      (1)
+    spacewander                   ++++
+
+    (1) There is only one modified file and it is not staged. The four
+    plusses means that the file has four lines, all contributed by spacewander.
+
 Find blame delta between two commits:
 
-    $ git guilt HEAD~2 HEAD
+    $ git guilt HEAD~3 HEAD^
     spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(115)
     Jesse Sipprell                -
 
 Find blame delta over the last three weeks:
 
-    $ git guilt `git log --until="3 weeks ago" --format="%H" -n 1` HEAD 
+    $ git guilt `git log --until="3 weeks ago" --format="%H" -n 1`
     Paul Schreiber                +++++++++++++++++++++++++++++++++++++++++++++(349)
     spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(113)
     Mark Eissler                  ++++++++++++++++++++++++++

From 8b4e50f74a34efebb40c949eae5ad873af911bff Mon Sep 17 00:00:00 2001
From: Nicolai Skogheim <nicolai.skogheim@gmail.com>
Date: Thu, 6 Aug 2015 05:58:25 +0200
Subject: [PATCH 4/4] guilt: remove --help option

git overrides execution when --help is given,
showing the man page for the command
---
 bin/git-guilt      | 2 +-
 man/git-guilt.1    | 2 +-
 man/git-guilt.html | 4 ++--
 man/git-guilt.md   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/git-guilt b/bin/git-guilt
index 988ecdb..dffd40f 100755
--- a/bin/git-guilt
+++ b/bin/git-guilt
@@ -3,7 +3,7 @@
 for param in $*
 do
     case $param in
-        -h|--help )
+        -h)
             echo 'Usage: git-guilt [<options>] <since> <until>'
             echo 'Calculates the change in blame between two revisions'
             echo 'Example: git guilt HEAD~3 HEAD'
diff --git a/man/git-guilt.1 b/man/git-guilt.1
index 0752403..9b3b38d 100644
--- a/man/git-guilt.1
+++ b/man/git-guilt.1
@@ -19,7 +19,7 @@ In the first form, shows total blame count for files with unstaged changes\.
 In the second form, calculates the change in blame between two revisions\. If not specified, <until> will default to HEAD\.
 .
 .SH "OPTIONS"
-\-h, \-\-help
+\-h
 .
 .P
 Output usage information
diff --git a/man/git-guilt.html b/man/git-guilt.html
index c6b7593..83ceb20 100644
--- a/man/git-guilt.html
+++ b/man/git-guilt.html
@@ -88,7 +88,7 @@ If not specified, &lt;until&gt; will default to HEAD.</p>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
-<p>  -h, --help</p>
+<p>  -h</p>
 
 <p>  Output usage information</p>
 
@@ -148,7 +148,7 @@ spacewander                   +++++++++++++++++++++++++++++++++++++++++++++(112)
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by spacewander &lt;<a href="&#x6d;&#97;&#x69;&#108;&#x74;&#x6f;&#x3a;&#115;&#112;&#97;&#99;&#x65;&#x77;&#97;&#x6e;&#100;&#101;&#114;&#108;&#122;&#120;&#64;&#x67;&#x6d;&#x61;&#x69;&#x6c;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x73;&#112;&#97;&#x63;&#x65;&#119;&#97;&#110;&#100;&#101;&#114;&#x6c;&#122;&#120;&#x40;&#103;&#109;&#x61;&#105;&#x6c;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
+<p>Written by spacewander &lt;<a href="&#109;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#115;&#x70;&#97;&#x63;&#101;&#x77;&#97;&#x6e;&#100;&#x65;&#114;&#x6c;&#x7a;&#x78;&#x40;&#103;&#x6d;&#x61;&#105;&#108;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x73;&#x70;&#97;&#99;&#x65;&#119;&#x61;&#110;&#100;&#x65;&#x72;&#108;&#122;&#x78;&#64;&#103;&#109;&#97;&#x69;&#108;&#x2e;&#x63;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
diff --git a/man/git-guilt.md b/man/git-guilt.md
index 983ed1a..2397673 100644
--- a/man/git-guilt.md
+++ b/man/git-guilt.md
@@ -15,7 +15,7 @@ If not specified, &lt;until&gt; will default to HEAD.
 
 ## OPTIONS
 
-  -h, --help
+  -h
 
   Output usage information