From 8aadf78cb6a27dafa647d25ff57c7cdbe119504e Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Fri, 16 Aug 2019 23:28:03 +0100
Subject: [PATCH 1/2] add github docker pacakge auto travis CI deployment

---
 .travis.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index df66aef..d2c2a0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,15 @@ matrix:
     - docker
     after_success:
     - echo "$DOCKER_PWD" | docker login -u $DOCKER_USR --password-stdin
+    - echo "$GITHUB_TOKEN" | docker login docker.pkg.github.com -u $GITHUB_USR --password-stdin
     - make -B docker
     - |
       if [[ -n "$TRAVIS_TAG" ]]; then
-      docker tag casperdcl/git-fame:latest casperdcl/git-fame:${TRAVIS_TAG#v} ; fi
+      docker tag casperdcl/git-fame:latest casperdcl/git-fame:${TRAVIS_TAG#v}
+      docker tag casperdcl/git-fame:latest docker.pkg.github.com/casperdcl/git-fame/git-fame:${TRAVIS_TAG#v} ; fi
     - docker tag casperdcl/git-fame:latest casperdcl/git-fame:devel
+    - docker tag casperdcl/git-fame:latest docker.pkg.github.com/casperdcl/git-fame/git-fame:latest
+    - docker tag casperdcl/git-fame:latest docker.pkg.github.com/casperdcl/git-fame/git-fame:devel
     - pip install .[dev]
     - make build
     - openssl aes-256-cbc -K $encrypted_88867ca921c3_key
@@ -51,12 +55,22 @@ matrix:
       script: docker push casperdcl/git-fame:${TRAVIS_TAG#v}
       on:
         tags: true
+    - provider: script
+      script: docker push docker.pkg.github.com/casperdcl/git-fame/git-fame:${TRAVIS_TAG#v}
+      on:
+        tags: true
     - provider: script
       script: docker push casperdcl/git-fame:latest
+    - provider: script
+      script: docker push docker.pkg.github.com/casperdcl/git-fame/git-fame:latest
     - provider: script
       script: docker push casperdcl/git-fame:devel
       on:
         branch: devel
+    - provider: script
+      script: docker push docker.pkg.github.com/casperdcl/git-fame/git-fame:devel
+      on:
+        branch: devel
   - python: pypy2.7-5.10.0
     env: TOXENV=pypy
   - python: pypy3.5-5.10.0

From b1d960bf35b622aaa480582de40009732ae44eb6 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Sat, 17 Aug 2019 00:07:40 +0100
Subject: [PATCH 2/2] update manpages

---
 Makefile           | 2 +-
 gitfame/git-fame.1 | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4df91ee..1f8da4f 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ testtimer:
 	nosetests gitfame --with-timer -d -v
 
 gitfame/git-fame.1: .meta/.git-fame.1.md gitfame/_gitfame.py
-	python -m gitfame --help | tail -n+9 | head -n-2 |\
+	python -m gitfame --help | tail -n+11 | head -n-2 |\
     sed -r -e 's/\\/\\\\/g' \
       -e 's/^  (--\S+) (\S+)\s*(.*)$$/\n\\\1=*\2*\n: \3/' \
       -e 's/^  (-\S+, )(-\S+)\s*/\n\\\1\\\2\n: /' |\
diff --git a/gitfame/git-fame.1 b/gitfame/git-fame.1
index 73d99d2..a51d3c7 100644
--- a/gitfame/git-fame.1
+++ b/gitfame/git-fame.1
@@ -33,7 +33,7 @@ git\ fame\ \-\-incl\ \[aq]\\.[cht][puh]{0,2}$\[aq]\ \-twMC
 .SH OPTIONS
 .TP
 .B <gitdir>
-[default: ./] optional arguments:
+[default: ./]
 .RS
 .RE
 .TP
@@ -124,6 +124,11 @@ show program\[aq]s version number and exit
 data [default: False].
 .RE
 .TP
+.B \-e, \-\-show\-email
+Show author email instead of name [default: False].
+.RS
+.RE
+.TP
 .B \-M, \-M
 Detect intra\-file line moves and copies [default: False].
 .RS