From 0c7bf665f228edd3fba8c2b54b8ede0898697dea Mon Sep 17 00:00:00 2001
From: Nicolai Skogheim <nicolai.skogheim@gmail.com>
Date: Sat, 29 Aug 2015 13:09:42 +0200
Subject: [PATCH 01/57] Fix typo in variable name

---
 bin/git-effort | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/git-effort b/bin/git-effort
index 6ee45bb77..f7ebe990b 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -180,7 +180,7 @@ else
   save_ifs=$IFS
   IFS=`echo -en "\n\b"`
   paths=(`git ls-files`)
-  IFS=$safe_ifs
+  IFS=$save_ifs
   unset save_ifs
 fi
 

From a7f830b1e7bbc25d6d5a9f29e67b3da73a9d2567 Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Tue, 8 Sep 2015 16:08:50 +0800
Subject: [PATCH 02/57] remove duplicate checkout

---
 bin/git-bug      | 3 +--
 bin/git-chore    | 3 +--
 bin/git-feature  | 3 +--
 bin/git-refactor | 4 +---
 4 files changed, 4 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 bin/git-chore

diff --git a/bin/git-bug b/bin/git-bug
index 37174e2c7..b748600ab 100755
--- a/bin/git-bug
+++ b/bin/git-bug
@@ -10,6 +10,5 @@ else
     echo "too many arguments; if not finishing a bug, only <name> of new bug is expected" && exit 1
   fi
   branch=bug/$1
-  git checkout -b $branch &> /dev/null
-  test -n $? && git checkout $branch &> /dev/null
+  git checkout -b $branch
 fi
diff --git a/bin/git-chore b/bin/git-chore
old mode 100644
new mode 100755
index d4030f8fc..47ac0a579
--- a/bin/git-chore
+++ b/bin/git-chore
@@ -10,6 +10,5 @@ else
     echo "too many arguments; if not finishing a chore, only <name> of new chore is expected" && exit 1
   fi
   branch=chore/$1
-  git checkout -b $branch &> /dev/null
-  test -n $? && git checkout $branch &> /dev/null
+  git checkout -b $branch
 fi
diff --git a/bin/git-feature b/bin/git-feature
index 9d105a1ec..5fd4cd8ba 100755
--- a/bin/git-feature
+++ b/bin/git-feature
@@ -20,6 +20,5 @@ else
   else 
     branch=feature/$1
   fi
-  git checkout -b $branch &> /dev/null
-  test -n $? && git checkout $branch &> /dev/null
+  git checkout -b $branch
 fi
diff --git a/bin/git-refactor b/bin/git-refactor
index 166f18049..445c0d253 100755
--- a/bin/git-refactor
+++ b/bin/git-refactor
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Removed unnecessary git checkout for bug, feature and refactor
 
 if test "$1" = "finish"; then
   test -z $2 && echo "refactor <name> required." 1>&2 && exit 1
@@ -11,6 +10,5 @@ else
     echo "too many arguments; if not finishing a refactor, only <name> of new refactoring is expected" && exit 1
   fi
   branch=refactor/$1
-  git checkout -b $branch &> /dev/null
-  test -n $? && git checkout $branch &> /dev/null
+  git checkout -b $branch
 fi

From 38c7b0337226f60f0182929b89890ff0d79fe705 Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Tue, 8 Sep 2015 13:25:44 +0800
Subject: [PATCH 03/57] add alias to git-feature

---
 bin/git-feature | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/bin/git-feature b/bin/git-feature
index 5fd4cd8ba..46292d36e 100755
--- a/bin/git-feature
+++ b/bin/git-feature
@@ -1,24 +1,41 @@
 #!/usr/bin/env bash
 
+branch_prefix=feature
+declare -a argv
+while test $# != 0
+do
+    case $1 in
+    -a|--alias )
+        if [[ -n $2 ]]
+        then
+            shift # shift -a|-alias
+            branch_prefix=$1
+        else
+            argv+=($1) # treat tail '-a' as <name>
+        fi
+        ;;
+    * )
+        argv+=($1)
+        ;;
+    esac
+    shift
+done
+
 concatargs(){
-    delim='-'
-    str=
-    for i in "$@";   do 
-        str="$str$delim$i"
-    done
-    branch=feature/${str:1}
+    str=$(IFS='-'; echo "$*")
+    branch="$branch_prefix"/$str
 }
 
-if test "$1" = "finish"; then
-  test -z $2 && echo "feature <name> required." 1>&2 && exit 1
-  branch=feature/$2
-  git merge --no-ff $branch && git delete-branch $branch
+if test "${argv[0]}" = "finish"; then
+  test -z "${argv[1]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
+  branch="$branch_prefix"/"${argv[1]}"
+  git merge --no-ff "$branch" && git delete-branch "$branch"
 else
-  test -z $1 && echo "feature <name> required." 1>&2 && exit 1
-  if test -n "$2"; then
-    concatargs ${@:2}
+  test -z "${argv[0]}" && echo "$branch_prefix" "<name> required." 1>&2 && exit 1
+  if test -n "${argv[1]}"; then
+    concatargs "${argv[@]}"
   else 
-    branch=feature/$1
+    branch="$branch_prefix"/"${argv[0]}"
   fi
   git checkout -b $branch
 fi

From f6f45990ab6718da256fc0d5644bdecb70a0b4ba Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Tue, 8 Sep 2015 13:37:30 +0800
Subject: [PATCH 04/57] update git-feature docs

---
 Commands.md            |   2 +-
 man/git-feature.1      |  24 ++++++--
 man/git-feature.1.html | 136 +++++++++++++++++++++++++++++++++++++++++
 man/git-feature.md     |  20 ++++--
 4 files changed, 170 insertions(+), 12 deletions(-)
 create mode 100644 man/git-feature.1.html

diff --git a/Commands.md b/Commands.md
index bda485a67..13bd7faab 100644
--- a/Commands.md
+++ b/Commands.md
@@ -72,7 +72,7 @@ Sets up the `gh-pages` branch.  (See [GitHub Pages](http://pages.github.com/) do
 
 ## git feature|refactor|bug|chore
 
-Create the given feature, refactor, bug or chore branch `name`:
+Create/Merge the given feature, refactor, bug or chore branch `name`:
 
 ```bash
 $ git feature dependencies
diff --git a/man/git-feature.1 b/man/git-feature.1
index 2afa90c8c..5a21b9d2f 100644
--- a/man/git-feature.1
+++ b/man/git-feature.1
@@ -1,18 +1,24 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-FEATURE" "1" "April 2015" "" ""
+.TH "GIT\-FEATURE" "1" "September 2015" "" ""
 .
 .SH "NAME"
-\fBgit\-feature\fR \- Create feature branch
+\fBgit\-feature\fR \- Create/Merge feature branch
 .
 .SH "SYNOPSIS"
-\fBgit\-feature\fR [finish] <name>
+\fBgit\-feature\fR [\-a|\-\-alias branch_prefix] [finish] <name>
 .
 .SH "DESCRIPTION"
-Create the given feature branch
+Create/Merge the given feature branch
 .
 .SH "OPTIONS"
+<\-a|\-\-alias branch_prefix>
+.
+.P
+use \fBbranch_prefix\fR instead of \fBfeature\fR
+.
+.P
 <finish>
 .
 .P
@@ -30,10 +36,16 @@ The name of the feature branch\.
 
 $ git feature dependencies
 \.\.\.
-$ git commit \-m "Some changes"
+$ (feature/dependencies) git commit \-m "Some changes"
 \.\.\.
-$ git checkout master
+$ (feature/dependencies) git checkout master
 $ git feature finish dependencies
+
+$ git alias features "feature \-a features"
+$ git features dependencies
+$ (features/dependencies) \.\.\.
+$ (features/dependencies) git checkout master
+$ git features finish dependencies
 .
 .fi
 .
diff --git a/man/git-feature.1.html b/man/git-feature.1.html
new file mode 100644
index 000000000..253d12c56
--- /dev/null
+++ b/man/git-feature.1.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' value='text/html;charset=utf8'>
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>git-feature(1) - Create/Merge feature branch</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#REPORTING-BUGS">REPORTING BUGS</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>git-feature(1)</li>
+    <li class='tc'></li>
+    <li class='tr'>git-feature(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>git-feature</code> - <span class="man-whatis">Create/Merge feature branch</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p><code>git-feature</code> [-a|--alias branch_prefix] [finish] &lt;name&gt;</p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>  Create/Merge the given feature branch</p>
+
+<h2 id="OPTIONS">OPTIONS</h2>
+
+<p>  &lt;-a|--alias branch_prefix&gt;</p>
+
+<p>  use <code>branch_prefix</code> instead of <code>feature</code></p>
+
+<p>  &lt;finish&gt;</p>
+
+<p>  Merge and delete the feature branch.</p>
+
+<p>  &lt;name&gt;</p>
+
+<p>  The name of the feature branch.</p>
+
+<h2 id="EXAMPLES">EXAMPLES</h2>
+
+<pre><code>$ git feature dependencies
+...
+$ (feature/dependencies) git commit -m "Some changes"
+...
+$ (feature/dependencies) git checkout master
+$ git feature finish dependencies
+
+$ git alias features "feature -a features"
+$ git features dependencies
+$ (features/dependencies) ...
+$ (features/dependencies) git checkout master
+$ git features finish dependencies
+</code></pre>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>Written by Jesús Espino &lt;<a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#106;&#x65;&#x73;&#112;&#105;&#110;&#x6f;&#103;&#64;&#103;&#x6d;&#x61;&#x69;&#x6c;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x6a;&#x65;&#x73;&#112;&#105;&#110;&#111;&#x67;&#x40;&#103;&#109;&#x61;&#105;&#108;&#46;&#99;&#111;&#109;</a>&gt;</p>
+
+<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
+
+<p>&lt;<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>&gt;</p>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;</p>
+
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'></li>
+    <li class='tc'>September 2015</li>
+    <li class='tr'>git-feature(1)</li>
+  </ol>
+
+  </div>
+</body>
+</html>
diff --git a/man/git-feature.md b/man/git-feature.md
index d9e7a6eaa..0c78c9c60 100644
--- a/man/git-feature.md
+++ b/man/git-feature.md
@@ -1,16 +1,20 @@
-git-feature(1) -- Create feature branch
+git-feature(1) -- Create/Merge feature branch
 =======================================
 
 ## SYNOPSIS
 
-`git-feature` [finish] &lt;name&gt;
+`git-feature` [-a|--alias branch_prefix] [finish] &lt;name&gt;
 
 ## DESCRIPTION
 
-  Create the given feature branch
+  Create/Merge the given feature branch
 
 ## OPTIONS
 
+  &lt;-a|--alias branch_prefix&gt;
+
+  use `branch_prefix` instead of `feature`
+
   &lt;finish&gt;
 
   Merge and delete the feature branch.
@@ -23,11 +27,17 @@ git-feature(1) -- Create feature branch
 
     $ git feature dependencies
     ...
-    $ git commit -m "Some changes"
+    $ (feature/dependencies) git commit -m "Some changes"
     ...
-    $ git checkout master
+    $ (feature/dependencies) git checkout master
     $ git feature finish dependencies
 
+    $ git alias features "feature -a features"
+    $ git features dependencies
+    $ (features/dependencies) ...
+    $ (features/dependencies) git checkout master
+    $ git features finish dependencies
+
 ## AUTHOR
 
 Written by Jesús Espino &lt;<jespinog@gmail.com>&gt;

From 639210660edf8abf9d1baa59bb29808faf35e0e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <hubscher.remy@gmail.com>
Date: Fri, 11 Sep 2015 20:14:36 +0200
Subject: [PATCH 05/57] Make sure git-authors doesn't return twice the same
 one.

---
 bin/git-authors | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/git-authors b/bin/git-authors
index 0996e3b27..2e51aff5b 100755
--- a/bin/git-authors
+++ b/bin/git-authors
@@ -21,7 +21,7 @@ fi
 #
 
 authors() {
-  git shortlog -sne | awk '{$1=""; sub(" ", ""); print}'
+  git shortlog -sne | awk '{$1=""; sub(" ", ""); print}' | awk -F'<' '!x[$1]++' | awk -F'<' '!x[$2]++'
 }
 
 #

From 9916356b142dc2d34992b03784afe818afe668da Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Sat, 12 Sep 2015 18:44:48 +0800
Subject: [PATCH 06/57] add alias conflict prompt

---
 Makefile | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ae4c71d43..6c2d2870e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,17 +23,33 @@ install:
 	$(eval TEMPFILE := $(shell mktemp -q ${TMPDIR:-/tmp}/git-extras.XXXXXX 2>/dev/null || mktemp -q))
 	@# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts
 	@chmod 775 $(TEMPFILE)
+	$(eval EXISTED_ALIASES := $(shell \
+		git config --get-regexp 'alias.*' | awk '{print "git-" substr($$1, 7)}'))
 	@$(foreach COMMAND, $(COMMANDS_USED_WITH_GIT_REPO), \
-		echo "... installing $(COMMAND)"; \
-		head -1 bin/$(COMMAND) | cat - $(LIB) ./helper/is-git-repo > $(TEMPFILE); \
-		tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
-		cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
+		disable=''; \
+		if test ! -z "$(filter $(COMMAND), $(EXISTED_ALIASES))"; then \
+			read -p "$(COMMAND) conflicts with an alias, still install it and disable the alias? [y/n]" answer; \
+			test "$$answer" = 'n' -o "$$answer" = 'N' && disable="true"; \
+		fi; \
+		if test -z "$$disable"; then \
+			echo "... installing $(COMMAND)"; \
+			head -1 bin/$(COMMAND) | cat - $(LIB) ./helper/is-git-repo > $(TEMPFILE); \
+			tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
+			cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
+		fi; \
 	)
 	@$(foreach COMMAND, $(COMMANDS_USED_WITHOUT_GIT_REPO), \
-		echo "... installing $(COMMAND)"; \
-		head -1 bin/$(COMMAND) | cat - $(LIB) > $(TEMPFILE); \
-		tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
-		cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
+		disable=''; \
+		if test ! -z "$(filter $(COMMAND), $(EXISTED_ALIASES))"; then \
+			read -p "$(COMMAND) conflicts with an alias, still install it and disable the alias? [y/n]" answer; \
+			test "$$answer" = 'n' -o "$$answer" = 'N' && disable="true"; \
+		fi; \
+		if test -z "$$disable"; then \
+			echo "... installing $(COMMAND)"; \
+			head -1 bin/$(COMMAND) | cat - $(LIB) > $(TEMPFILE); \
+			tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
+			cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
+		fi; \
 	)
 	@if [ -z "$(wildcard man/git-*.1)" ]; then \
 		echo "WARNING: man pages not created, use 'make docs' (which requires 'ronn' ruby lib)"; \

From 86e1a7014cd2effe1b8260b760b3b6c5a738ac8f Mon Sep 17 00:00:00 2001
From: Nicolai Skogheim <nicolai.skogheim@gmail.com>
Date: Sat, 29 Aug 2015 15:14:26 +0200
Subject: [PATCH 07/57] effort: More robust argument parsing

Why:

* The old way of handling arguments could make it
difficult to make non-breaking changes because
to be able to handle more arguments than the
'--above' argument, the logic would need to be heavily
refactored and demand restrictions on argument order.

This change addresses the need by:

* Parse arguments in a cleaner way
* Make the command more future proof with respect to arguments

Notable change is the synopsis. Please the see man page.
---
 bin/git-effort      | 80 ++++++++++++++++-----------------------------
 man/git-effort.1    | 48 ++++++++++++++++++---------
 man/git-effort.html | 41 +++++++++++++++--------
 man/git-effort.md   | 36 +++++++++++++-------
 4 files changed, 112 insertions(+), 93 deletions(-)

diff --git a/bin/git-effort b/bin/git-effort
index f7ebe990b..7d0be16cc 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -115,41 +115,32 @@ sort_effort() {
   < $tmp sort -rn -k 2
 }
 
-above_index=0
-has_above=false
-next_is_above=false
-num_paths=0
-
-# Some implementations of `seq` gives "1\n0" for seq 0
-if [ $# -gt 0 ] ; then
-  for i in `seq ${#@}`
-  do
-    cur="${!i}"
-
-    if "$next_is_above" ; then
-      above="$cur"
-      next_is_above=false
-      continue
-    fi
-
-    case "$cur" in
-      --above)
-              if "$has_above" ; then
-                echo "error: --above can only be specified one time" 1>&2
-                exit 1
-              fi
-              next_is_above=true
-              has_above=true
-              above_index=$(( i - 1 ))
-              ;;
-          --*)
-              ;;
-            *)
-              num_paths=$(( num_paths + 1 ))
-              ;;
-    esac
-  done
-fi
+declare -a paths=()
+while [ "${#}" -ge 1 ] ; do
+
+  case "$1" in
+    --above)
+      shift
+      above=$1
+      ;;
+    --)
+      shift
+      args_to_git_log=$(printf " %q" "${@:1}")
+      break
+      ;;
+    --*)
+      echo 1>&2 "error: unknown argument $1"
+      echo 1>&2 "error: if that argument was meant for git-log,"
+      echo 1>&2 "error: please put it after two dashes ( -- )."
+      exit 1
+      ;;
+    *)
+      paths+=( "$1" )
+      ;;
+  esac
+
+  shift
+done
 
 # Exit if above-value is not an int
 if [ -z "${above##*[!0-9]*}" ] ; then
@@ -157,26 +148,13 @@ if [ -z "${above##*[!0-9]*}" ] ; then
   exit 1
 fi
 
-args_before_above=`printf " %q" "${@:1:$above_index}"`
-
-num_args=$(( i - num_paths ))
-if $has_above ; then offset=2 ; else offset=0 ; fi
-from=$(( 1 + above_index + offset ))
-len=$(( num_args - $(( above_index + offset)) ))
-args_after_above=`printf " %q" "${@:$from:$len}"`
-
-args_to_git_log="${args_before_above#\ \'\'}${args_after_above#\ \'\'}"
-
-shift $num_args
-
+# remove empty quotes that appear when there are no arguments
+args_to_git_log="${args_to_git_log#\ \'\'}"
 export args_to_git_log
 
 # [path ...]
 
-declare -a paths=()
-if test $# -ge 1; then
-  paths=("$@")
-else
+if test "${#paths}" -eq 0; then
   save_ifs=$IFS
   IFS=`echo -en "\n\b"`
   paths=(`git ls-files`)
diff --git a/man/git-effort.1 b/man/git-effort.1
index ce9afef97..a30097477 100644
--- a/man/git-effort.1
+++ b/man/git-effort.1
@@ -1,13 +1,13 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-EFFORT" "1" "August 2015" "" "Git Extras"
+.TH "GIT\-EFFORT" "1" "September 2015" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-effort\fR \- Show effort statistics on file(s)
 .
 .SH "SYNOPSIS"
-\fBgit\-effort\fR [\-\-above <value>] [<options>] [[\-\-] <path>\.\.\.]
+\fBgit\-effort\fR [\-\-above <value>] [<path>\.\.\.] [\-\- [<log options>\.\.\.]]
 .
 .SH "DESCRIPTION"
 Shows effort statistics about files in the repository\.
@@ -28,22 +28,19 @@ Display includes:
 Ignore files with commits <= a value\.
 .
 .P
-Run
+<path>\.\.\.
 .
-.br
-man \-P \'less +/Commit\e Limiting\' git\-log
-.
-.br
-to read about options to limit which commits are counted\.
+.P
+Only count commits that touches the given paths\.
 .
 .P
-Note: \fBgit\-effort\fR does not accept commit ranges\.
+Note: \fBgit\-effort\fR does not accept revision ranges, but the underlying \fBgit log\fR does (See the examples)\.
 .
 .P
-[\-\-] <path>\.\.\.
+<log options>\.\.\.
 .
 .P
-Only count commits that touches the given paths\.
+Options for \fBgit log\fR\. Note that you must use \fB\-\-\fR to separate options to \fBgit log\fR from options to \fBgit effort\fR\. This makes it possible to only count commits you are interested in\. Not all options are relevant in the context of \fBgit\-effort\fR, but those that are is listed under the "Commit Limiting" section on the \fBgit\-log\fR manpages\.
 .
 .SH "EXAMPLES"
 Note: Output will first appear unsorted, then the screen is cleared and the sorted list is output\. The initial unsorted list is not shown in the examples for brevity\.
@@ -70,7 +67,7 @@ $ git effort \-\-above 5
   git\-repl                                      7          5
 
 
-$ git effort \-\-after="one year ago" \-\-above 5 \-\-author="Leila Muhtasib"
+$ git effort \-\-above 5 bin/* \-\- \-\-after="one year ago" \-\-author="Leila Muhtasib"
 
   file                                          commits    active days
 
@@ -86,18 +83,37 @@ $ git effort \-\-after="one year ago" \-\-above 5 \-\-author="Leila Muhtasib"
 .IP "" 0
 .
 .P
-Showing statistics on directories is also possible
+Showing statistics on directories is also possible:
 .
 .IP "" 4
 .
 .nf
 
-$ git effort bin man
+$ git effort bin man \-\- \-\-after="one year ago"
+
+  file                                          commits    active days
+
+  bin\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 406        232
+  man\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 118        80
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Only count commits in the specified revision range:
+.
+.P
+$ git effort \-\- master\.\.feature
+.
+.IP "" 4
+.
+.nf
 
   file                                          commits    active days
 
-  bin\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 406         232
-  man\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 118         80
+  bin/git\-effort\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 3          2
+  man/git\-effort\.md\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\.\. 1          1
 .
 .fi
 .
diff --git a/man/git-effort.html b/man/git-effort.html
index f9d2a8f50..5a9408f1b 100644
--- a/man/git-effort.html
+++ b/man/git-effort.html
@@ -76,7 +76,7 @@ <h2 id="NAME">NAME</h2>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>git-effort</code> [--above &lt;value&gt;] [&lt;options&gt;] [[--] &lt;path&gt;...]</p>
+<p><code>git-effort</code> [--above &lt;value&gt;]  [&lt;path&gt;...] [-- [&lt;log options&gt;...]]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -92,15 +92,18 @@ <h2 id="OPTIONS">OPTIONS</h2>
 
 <p>  Ignore files with commits &lt;= a value.</p>
 
-<p>  Run<br />
-  man -P 'less +/Commit\ Limiting' git-log<br />
-  to read about options to limit which commits are counted.</p>
+<p>  &lt;path&gt;...</p>
 
-<p>  Note: <code>git-effort</code> does not accept commit ranges.</p>
+<p>  Only count commits that touches the given paths.</p>
 
-<p>  [--] &lt;path&gt;...</p>
+<p>  Note: <code>git-effort</code> does not accept revision ranges, but the underlying <code>git log</code> does (See the examples).</p>
 
-<p>  Only count commits that touches the given paths.</p>
+<p>  &lt;log options&gt;...</p>
+
+<p>  Options for <code>git log</code>. Note that you must use <code>--</code> to separate options to <code>git log</code>
+  from options to <code>git effort</code>.
+  This makes it possible to only count commits you are interested in.
+  Not all options are relevant in the context of <code>git-effort</code>, but those that are is listed under the "Commit Limiting" section on the <code>git-log</code> manpages.</p>
 
 <h2 id="EXAMPLES">EXAMPLES</h2>
 
@@ -124,7 +127,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
   git-repl                                      7          5
 
 
-$ git effort --after="one year ago" --above 5 --author="Leila Muhtasib"
+$ git effort --above 5 bin/* -- --after="one year ago" --author="Leila Muhtasib"
 
   file                                          commits    active days
 
@@ -136,19 +139,29 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
   git-graft                                     2          2
 </code></pre>
 
-<p> Showing statistics on directories is also possible</p>
+<p> Showing statistics on directories is also possible:</p>
 
-<pre><code>$ git effort bin man
+<pre><code>$ git effort bin man -- --after="one year ago"
 
   file                                          commits    active days
 
-  bin.......................................... 406         232
-  man.......................................... 118         80
+  bin.......................................... 406        232
+  man.......................................... 118        80
+</code></pre>
+
+<p> Only count commits in the specified revision range:</p>
+
+<p>   $ git effort -- master..feature</p>
+
+<pre><code>  file                                          commits    active days
+
+  bin/git-effort............................... 3          2
+  man/git-effort.md............................ 1          1
 </code></pre>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Leila Muhtasib &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#109;&#x75;&#104;&#x74;&#97;&#115;&#x69;&#x62;&#64;&#103;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6d;&#117;&#x68;&#116;&#97;&#x73;&#x69;&#x62;&#64;&#x67;&#x6d;&#97;&#x69;&#108;&#x2e;&#x63;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Leila Muhtasib &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#109;&#117;&#x68;&#116;&#x61;&#x73;&#105;&#98;&#64;&#x67;&#109;&#x61;&#x69;&#x6c;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#109;&#x75;&#104;&#116;&#x61;&#x73;&#x69;&#x62;&#64;&#x67;&#109;&#97;&#105;&#108;&#46;&#x63;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -161,7 +174,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>September 2015</li>
     <li class='tr'>git-effort(1)</li>
   </ol>
 
diff --git a/man/git-effort.md b/man/git-effort.md
index da031be3a..90fb9c37c 100644
--- a/man/git-effort.md
+++ b/man/git-effort.md
@@ -3,7 +3,7 @@ git-effort(1) -- Show effort statistics on file(s)
 
 ## SYNOPSIS
 
-`git-effort` [--above &lt;value&gt;] [&lt;options&gt;] [[--] &lt;path&gt;...]
+`git-effort` [--above &lt;value&gt;]  [&lt;path&gt;...] [-- [&lt;log options&gt;...]]
 
 ## DESCRIPTION
 
@@ -19,15 +19,18 @@ git-effort(1) -- Show effort statistics on file(s)
 
   Ignore files with commits &lt;= a value.
 
-  Run  
-  man -P 'less +/Commit\ Limiting' git-log  
-  to read about options to limit which commits are counted.  
+  &lt;path&gt;...
 
-  Note: `git-effort` does not accept commit ranges.  
+  Only count commits that touches the given paths.
 
-  [--] &lt;path&gt;...
+  Note: `git-effort` does not accept revision ranges, but the underlying `git log` does (See the examples).  
 
-  Only count commits that touches the given paths.
+  &lt;log options&gt;...
+
+  Options for `git log`. Note that you must use `--` to separate options to `git log`
+  from options to `git effort`.
+  This makes it possible to only count commits you are interested in.
+  Not all options are relevant in the context of `git-effort`, but those that are is listed under the "Commit Limiting" section on the `git-log` manpages.
 
 ## EXAMPLES
 
@@ -51,7 +54,7 @@ git-effort(1) -- Show effort statistics on file(s)
       git-repl                                      7          5
 
 
-    $ git effort --after="one year ago" --above 5 --author="Leila Muhtasib"
+    $ git effort --above 5 bin/* -- --after="one year ago" --author="Leila Muhtasib"
 
       file                                          commits    active days
 
@@ -62,14 +65,23 @@ git-effort(1) -- Show effort statistics on file(s)
       git-changelog                                 3          2
       git-graft                                     2          2
 
- Showing statistics on directories is also possible
+ Showing statistics on directories is also possible:
+
+    $ git effort bin man -- --after="one year ago"
+
+      file                                          commits    active days
+
+      bin.......................................... 406        232
+      man.......................................... 118        80
+
+ Only count commits in the specified revision range:
 
-    $ git effort bin man
+   $ git effort -- master..feature
 
       file                                          commits    active days
 
-      bin.......................................... 406         232
-      man.......................................... 118         80
+      bin/git-effort............................... 3          2
+      man/git-effort.md............................ 1          1
 
 
 ## AUTHOR

From e91fd9623f4570ec235b312403717c4e423e5a8a Mon Sep 17 00:00:00 2001
From: Nicolai Skogheim <nicolai.skogheim@gmail.com>
Date: Sun, 13 Sep 2015 23:56:56 +0200
Subject: [PATCH 08/57] effort: add usage message

---
 bin/git-effort | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bin/git-effort b/bin/git-effort
index 7d0be16cc..46e354742 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -4,6 +4,13 @@ tmp=$(git_extra_mktemp)
 above=0
 color=
 
+#
+# print usage message
+#
+usage() {
+  echo 1>&2 "usage: git effort [--above <value>] [<path>...] [-- [<log options>...]]"
+}
+
 #
 # get dates for the given <commit>
 #
@@ -129,6 +136,7 @@ while [ "${#}" -ge 1 ] ; do
       break
       ;;
     --*)
+      usage
       echo 1>&2 "error: unknown argument $1"
       echo 1>&2 "error: if that argument was meant for git-log,"
       echo 1>&2 "error: please put it after two dashes ( -- )."

From 80f060b213cc27e7b0fd35816bf5d180864f29ac Mon Sep 17 00:00:00 2001
From: Nicolai Skogheim <nicolai.skogheim@gmail.com>
Date: Mon, 14 Sep 2015 00:00:39 +0200
Subject: [PATCH 09/57] effort: change order of arguments to function

This makes git effort less prone to failing if
someone passes formatting options
---
 bin/git-effort | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/git-effort b/bin/git-effort
index 46e354742..3281b552a 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -15,7 +15,7 @@ usage() {
 # get dates for the given <commit>
 #
 dates() {
-  eval "git log --pretty='format: %ad' --date=short $args_to_git_log \"$1\""
+  eval "git log $args_to_git_log --pretty='format: %ad' --date=short \"$1\""
 }
 
 #

From 6a000ec99bd3e32c84e6bff07dad400cfba73631 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Mon, 14 Sep 2015 13:18:47 +0100
Subject: [PATCH 10/57] effort, summary: Correctly estimate the number of
 active days

The output of `git log` is not exactly in chronological order. The
default sort option (--date-order) is described in the man page as
follows:

    Show no parents before all of its children are shown, but otherwise
    show commits in the commit timestamp order.

The `uniq` program will only remove duplicate lines if they follow each
other. In order for this to work correctly, we need to ensure that the
list of dates is exactly in chronological order. There doesn't seem to
be a `git log` option to achieve this, but we can use the `sort`
program. I used reverse sort (`sort -r`) since the output will be roughly
reverse-sorted already.

It's also worth noting that the default --date-order option sorts by
commit date, but git-summary uses *author* date (%ai). Passing
--author-date-order doesn't fix this issue, though, so I didn't change
that.

At the time of writing, this change reduces the number of 'active days'
for git-extras.git from 367 to 331.
---
 bin/git-effort  | 2 +-
 bin/git-summary | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/git-effort b/bin/git-effort
index 3281b552a..6dc859046 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -42,7 +42,7 @@ show_cursor_and_cleanup() {
 #
 
 active_days() {
-  echo "$1" | uniq | wc -l
+  echo "$1" | sort -r | uniq | wc -l
 }
 
 #
diff --git a/bin/git-summary b/bin/git-summary
index c1bcdce9f..8b69000fc 100755
--- a/bin/git-summary
+++ b/bin/git-summary
@@ -21,7 +21,7 @@ date() {
 #
 
 active_days() {
-  date $1 | uniq | awk '
+  date $1 | sort -r | uniq | awk '
     { sum += 1 }
     END { print sum }
   '

From c0ad975f227a6da9ae8bec6ab3bc6c6a292a162d Mon Sep 17 00:00:00 2001
From: Richard Littauer <richard.littauer@gmail.com>
Date: Mon, 14 Sep 2015 11:01:35 -0400
Subject: [PATCH 11/57] Alphabetized list

---
 Commands.md | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/Commands.md b/Commands.md
index 13bd7faab..a9ac4c060 100644
--- a/Commands.md
+++ b/Commands.md
@@ -1,49 +1,49 @@
 
- - [`git extras`](#git-extras)
- - [`git squash`](#git-squash)
- - [`git summary`](#git-summary)
- - [`git line-summary`](#git-line-summary)
- - [`git effort`](#git-effort)
+ - [`git alias`](#git-alias)
+ - [`git archive-file`](#git-archive-file)
  - [`git authors`](#git-authors)
  - [`git changelog`](#git-changelog)
  - [`git clear`](#git-clear)
  - [`git commits-since`](#git-commits-since)
+ - [`git contrib`](#git-contrib)
  - [`git count`](#git-count)
  - [`git create-branch`](#git-create-branch)
  - [`git delete-branch`](#git-delete-branch)
+ - [`git delete-merged-branches`](#git-delete-merged-branches)
  - [`git delete-submodule`](#git-delete-submodule)
  - [`git delete-tag`](#git-delete-tag)
- - [`git delete-merged-branches`](#git-delete-merged-branches)
+ - [`git delta`](#git-delta)
+ - [`git effort`](#git-effort)
+ - [`git extras`](#git-extras)
+ - [`git feature|refactor|bug|chore`](#git-featurerefactorbugchore)
+ - [`git fork`](#git-fork)
  - [`git fresh-branch`](#git-fresh-branch)
- - [`git guilt`](#git-guilt)
- - [`git merge-into`](#git-merge-into)
+ - [`git gh-pages`](#git-gh-pages)
  - [`git graft`](#git-graft)
- - [`git alias`](#git-alias)
+ - [`git guilt`](#git-guilt)
  - [`git ignore`](#git-ignore)
  - [`git info`](#git-info)
- - [`git fork`](#git-fork)
+ - [`git line-summary`](#git-line-summary)
+ - [`git local-commits`](#git-local-commits)
+ - [`git lock`](#git-lock)
+ - [`git locked`](#git-locked)
+ - [`git merge-into`](#git-merge-into)
+ - [`git merge-repo`](#git-merge-repo)
+ - [`git missing`](#git-missing)
+ - [`git obliterate`](#git-obliterate)
+ - [`git pr`](#git-pr)
+ - [`git psykorebase`](#git-psykorebase)
  - [`git release`](#git-release)
- - [`git contrib`](#git-contrib)
  - [`git repl`](#git-repl)
- - [`git undo`](#git-undo)
- - [`git gh-pages`](#git-gh-pages)
+ - [`git reset-file`](#git-reset-file)
+ - [`git root`](#git-root)
  - [`git scp`](#git-scp)
  - [`git setup`](#git-setup)
+ - [`git squash`](#git-squash)
+ - [`git summary`](#git-summary)
  - [`git touch`](#git-touch)
- - [`git obliterate`](#git-obliterate)
- - [`git feature|refactor|bug|chore`](#git-featurerefactorbugchore)
- - [`git local-commits`](#git-local-commits)
- - [`git archive-file`](#git-archive-file)
- - [`git missing`](#git-missing)
- - [`git lock`](#git-lock)
- - [`git locked`](#git-locked)
+ - [`git undo`](#git-undo)
  - [`git unlock`](#git-unlock)
- - [`git reset-file`](#git-reset-file)
- - [`git pr`](#git-pr)
- - [`git root`](#git-root)
- - [`git delta`](#git-delta)
- - [`git merge-repo`](#git-merge-repo)
- - [`git psykorebase`](#git-psykorebase)
 
 ## git extras
 

From 5f61bfad6ecd86a45a0900d8aeef0ef0b5006cce Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@lrde.epita.fr>
Date: Wed, 23 Sep 2015 19:27:19 +0200
Subject: [PATCH 12/57] summary: beware of locale issues, and pass options to
 line-summary

* bin/git-summary: here.
---
 bin/git-summary | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/git-summary b/bin/git-summary
index 8b69000fc..33f21be7c 100755
--- a/bin/git-summary
+++ b/bin/git-summary
@@ -48,7 +48,7 @@ file_count() {
 #
 
 authors() {
-  git shortlog -n -s $commit | awk '
+  git shortlog -n -s $commit | LC_ALL=C awk '
   { args[NR] = $0; sum += $0 }
   END {
     for (i = 1; i <= NR; ++i) {
@@ -69,7 +69,8 @@ repository_age() {
 # summary
 
 if test "$1" = "--line"; then
-  git line-summary
+  shift
+  git line-summary "$@"
   echo
 else
 

From 7b74567550e7d1fe3b9b08996acceff60f387814 Mon Sep 17 00:00:00 2001
From: Johannes Ewald <johannes.ewald@peerigon.com>
Date: Thu, 24 Sep 2015 16:11:06 +0200
Subject: [PATCH 13/57] Add possibility to also checkout pull requests based on
 GitHub urls

---
 Commands.md |  9 +++++++++
 bin/git-pr  | 12 ++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Commands.md b/Commands.md
index a9ac4c060..7da4fc758 100644
--- a/Commands.md
+++ b/Commands.md
@@ -846,6 +846,15 @@ From https://github.com/tj/git-extras
 Switched to branch 'pr/226'
 ```
 
+You can also checkout a pull request based on a GitHub url
+
+```bash
+$ git pr https://github.com/tj/git-extras/pull/453
+From https://github.com/tj/git-extras
+ * [new ref]         refs/pull/453/head -> pr/453
+Switched to branch 'pr/453'
+```
+
 To remove all local pull request branches, provide the magic `clean` parameter:
 
 ```bash
diff --git a/bin/git-pr b/bin/git-pr
index 35a65f3de..a7e1fdf86 100755
--- a/bin/git-pr
+++ b/bin/git-pr
@@ -1,11 +1,19 @@
 #!/usr/bin/env bash
-# Based on https://gist.github.com/gnarf/5406589
+# Based on https://gist.github.com/gnarf/5406589 and https://gist.github.com/jhnns/d654d9d6da6d3b749986
 
 if test "$1" = "clean"; then
   git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref; do
     git branch -D ${ref#refs/heads/}
   done
+  exit 0
+elif [[ $1 =~ ^(https?://[^/]+/(.+))/pull/([0-9]+).*$ ]]; then
+  remote=${BASH_REMATCH[1]}.git
+  id=${BASH_REMATCH[3]}
+  branch=pr/$id
 else
   test -z $1 && echo "pr number required." 1>&2 && exit 1
-  git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1
+  remote=${2:-origin}
+  id=$1
+  branch=pr/$id
 fi
+git fetch -fu $remote refs/pull/$id/head:$branch && git checkout $branch

From 5b285380e794ca059aa028eceffb5a773d222d15 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 2 Oct 2015 03:48:53 -0400
Subject: [PATCH 14/57] Makefile: escape $ used inside eval as shell variable

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6c2d2870e..a2f5caa57 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ install:
 	@mkdir -p $(DESTDIR)$(BINPREFIX)
 	@echo "... installing bins to $(DESTDIR)$(BINPREFIX)"
 	@echo "... installing man pages to $(DESTDIR)$(MANPREFIX)"
-	$(eval TEMPFILE := $(shell mktemp -q ${TMPDIR:-/tmp}/git-extras.XXXXXX 2>/dev/null || mktemp -q))
+	$(eval TEMPFILE := $(shell mktemp -q $${TMPDIR:-/tmp}/git-extras.XXXXXX 2>/dev/null || mktemp -q))
 	@# chmod from rw-------(default) to rwxrwxr-x, so that users can exec the scripts
 	@chmod 775 $(TEMPFILE)
 	$(eval EXISTED_ALIASES := $(shell \

From ed7dcb7682c7bfded308a98d48fd8f9f72df30ca Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 2 Oct 2015 05:47:08 -0400
Subject: [PATCH 15/57] Makefile: refactor is-git-repo inclusion logic

This avoids the need for a big repeated block of code.
---
 Makefile      | 26 ++++++++------------------
 need_git_repo |  6 ++++++
 2 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 need_git_repo

diff --git a/Makefile b/Makefile
index a2f5caa57..a68ab189a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,10 @@ BINS = $(wildcard bin/git-*)
 MANS = $(wildcard man/git-*.md)
 MAN_HTML = $(MANS:.md=.html)
 MAN_PAGES = $(MANS:.md=.1)
+# Libraries used by all commands
 LIB = "helper/reset-env" "helper/git-extra-utility"
 
-COMMANDS_USED_WITHOUT_GIT_REPO = git-alias git-extras git-fork git-setup
-COMMANDS_USED_WITH_GIT_REPO = $(filter-out $(COMMANDS_USED_WITHOUT_GIT_REPO), \
-							  $(subst bin/, , $(BINS)))
+COMMANDS = $(subst bin/, , $(BINS))
 
 default: install
 
@@ -25,7 +24,7 @@ install:
 	@chmod 775 $(TEMPFILE)
 	$(eval EXISTED_ALIASES := $(shell \
 		git config --get-regexp 'alias.*' | awk '{print "git-" substr($$1, 7)}'))
-	@$(foreach COMMAND, $(COMMANDS_USED_WITH_GIT_REPO), \
+	@$(foreach COMMAND, $(COMMANDS), \
 		disable=''; \
 		if test ! -z "$(filter $(COMMAND), $(EXISTED_ALIASES))"; then \
 			read -p "$(COMMAND) conflicts with an alias, still install it and disable the alias? [y/n]" answer; \
@@ -33,20 +32,11 @@ install:
 		fi; \
 		if test -z "$$disable"; then \
 			echo "... installing $(COMMAND)"; \
-			head -1 bin/$(COMMAND) | cat - $(LIB) ./helper/is-git-repo > $(TEMPFILE); \
-			tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
-			cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
-		fi; \
-	)
-	@$(foreach COMMAND, $(COMMANDS_USED_WITHOUT_GIT_REPO), \
-		disable=''; \
-		if test ! -z "$(filter $(COMMAND), $(EXISTED_ALIASES))"; then \
-			read -p "$(COMMAND) conflicts with an alias, still install it and disable the alias? [y/n]" answer; \
-			test "$$answer" = 'n' -o "$$answer" = 'N' && disable="true"; \
-		fi; \
-		if test -z "$$disable"; then \
-			echo "... installing $(COMMAND)"; \
-			head -1 bin/$(COMMAND) | cat - $(LIB) > $(TEMPFILE); \
+			head -1 bin/$(COMMAND) > $(TEMPFILE); \
+			cat $(LIB) >> $(TEMPFILE); \
+			if grep "$(COMMAND)" need_git_repo >/dev/null; then \
+				cat ./helper/is-git-repo >> $(TEMPFILE); \
+			fi; \
 			tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
 			cp -f $(TEMPFILE) $(DESTDIR)$(BINPREFIX)/$(COMMAND); \
 		fi; \
diff --git a/need_git_repo b/need_git_repo
new file mode 100644
index 000000000..5f5e38880
--- /dev/null
+++ b/need_git_repo
@@ -0,0 +1,6 @@
+# A list of the commands that use is_git_repo, and should have
+# it included in the "built" version of the command
+git-alias
+git-extras
+git-fork
+git-setup

From b2817c7299765c425c3e11c7b175f49c36ddd76a Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 2 Oct 2015 06:35:38 -0400
Subject: [PATCH 16/57] git-effort: use portable terminal escape sequences

Also uses "default color" instead of "black" for the low-activity things, so
it still shows up on colorschemes that have dark backgrounds.
---
 bin/git-effort | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/bin/git-effort b/bin/git-effort
index 6dc859046..e594f7187 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -18,12 +18,18 @@ dates() {
   eval "git log $args_to_git_log --pretty='format: %ad' --date=short \"$1\""
 }
 
+# tput, being quiet about unknown capabilities
+tputq() {
+  tput "$@" 2>/dev/null
+  return 0
+}
+
 #
 # hide cursor
 #
 
 hide_cursor() {
-  printf '\033[?25l'
+  tputq civis 
 }
 
 #
@@ -31,8 +37,8 @@ hide_cursor() {
 #
 
 show_cursor_and_cleanup() {
-  printf '\033[?25h'
-  printf '\033[m\n'
+  tputq cvvis
+  tputq sgr0
   rm "$tmp" > /dev/null 2>&1
   exit 0
 }
@@ -50,14 +56,16 @@ active_days() {
 #
 
 color_for() {
-  test $1 -gt 10 && color='33'
-  test $1 -gt 25 && color='33;1'
-  test $1 -gt 50 && color='93'
-  test $1 -gt 75 && color='93;1'
-  test $1 -gt 100 && color='31'
-  test $1 -gt 125 && color='31;1'
-  test $1 -gt 150 && color='91'
-  test $1 -gt 200 && color='91;1'
+  if   [ $1 -gt 200 ]; then color="$(tputq setaf 1)$(tputq bold)"
+  elif [ $1 -gt 150 ]; then color="$(tputq setaf 1)"  # red
+  elif [ $1 -gt 125 ]; then color="$(tputq setaf 2)$(tputq bold)"
+  elif [ $1 -gt 100 ]; then color="$(tputq setaf 2)"  # green
+  elif [ $1 -gt 75 ]; then color="$(tputq setaf 93)$(tputq bold)"
+  elif [ $1 -gt 50 ]; then color="$(tputq setaf 93)"  # purplish
+  elif [ $1 -gt 25 ]; then color="$(tputq setaf 3)$(tputq bold)"
+  elif [ $1 -gt 10 ]; then color="$(tputq setaf 3)"  # yellow
+  else color="$(tputq sgr0)" # default color
+  fi
 }
 
 #
@@ -67,6 +75,8 @@ color_for() {
 effort() {
     path=$1
     local commit_dates
+    local color reset_color commits len dot f_dot i msg active
+    reset_color="$(tputq sgr0)"
     commit_dates=`dates "$path"`
     [ $? -gt 0 ] && exit 255
 
@@ -92,12 +102,12 @@ effort() {
       i=$(($i+1))
     done
 
-    msg=$(printf "  \033[${color}m%s %-10d" "$f_dot" $commits)
+    msg=$(printf "  ${color}%s %-10d" "$f_dot" $commits)
 
     # active days
     active=`active_days "$commit_dates"`
     color_for $(( $active - $above ))
-    msg="$msg $(printf "\033[${color}m %d\033[0m\n" $active)"
+    msg="$msg $(printf "${color} %d${reset_color}\n" $active)"
     echo "$msg"
 }
 
@@ -117,7 +127,7 @@ heading() {
 
 sort_effort() {
   clear
-  echo
+  echo " "
   heading
   < $tmp sort -rn -k 2
 }
@@ -180,6 +190,7 @@ export -f effort
 export -f color_for
 export -f active_days
 export -f dates
+export -f tputq
 export above
 export log_args
 

From 19f66943cbe857760305e20ae4b2b85f36a39fff Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Fri, 2 Oct 2015 08:35:04 -0400
Subject: [PATCH 17/57] git-summary: protect against character encoding issues
 with LC_ALL=C

---
 bin/git-line-summary | 2 +-
 bin/git-summary      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/git-line-summary b/bin/git-line-summary
index 74c0166f1..940bd7326 100755
--- a/bin/git-line-summary
+++ b/bin/git-line-summary
@@ -9,7 +9,7 @@ single_file() {
   while read data
   do
     if [[ $(file "$data") = *text* ]]; then
-      git blame --line-porcelain "$data" 2>/dev/null | grep "^author\ " | sed -n 's/^author //p';
+      git blame --line-porcelain "$data" 2>/dev/null | grep "^author\ " | LC_ALL=C sed -n 's/^author //p';
     fi
   done
 }
diff --git a/bin/git-summary b/bin/git-summary
index 33f21be7c..7643f10c4 100755
--- a/bin/git-summary
+++ b/bin/git-summary
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+
 SUBDIRECTORY_OK=Yes
 source "$(git --exec-path)/git-sh-setup"
 cd_to_toplevel
@@ -63,7 +64,7 @@ authors() {
 #
 
 repository_age() {
-  git log --reverse --pretty=oneline --format="%ar" | head -n 1 | sed 's/ago//'
+  git log --reverse --pretty=oneline --format="%ar" | head -n 1 | LC_ALL=C sed 's/ago//'
 }
 
 # summary

From 7ae2e0b9efb40ba6d2430d9076f215869d2df4c0 Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Thu, 8 Oct 2015 10:24:31 +0800
Subject: [PATCH 18/57] git-scp: use portable terminal escape sequences

---
 bin/git-scp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/git-scp b/bin/git-scp
index 7481b6087..e12c3c9a3 100755
--- a/bin/git-scp
+++ b/bin/git-scp
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-COLOR_RED()   { echo -en "\033[31m"; }
-COLOR_GREEN() { echo -en "\033[32m"; }
-COLOR_YELLOW(){ echo -en "\033[33m"; }
-COLOR_BLUE()  { echo -en "\033[34m"; }
-COLOR_RESET() { echo -en "\033[0m";  }
+COLOR_RED()   { test -t 1 && echo -n "$(tput setaf 1)"; }
+COLOR_GREEN() { test -t 1 && echo -n "$(tput setaf 2)"; }
+COLOR_YELLOW(){ test -t 1 && echo -n "$(tput setaf 3)"; }
+COLOR_BLUE()  { test -t 1 && echo -n "$(tput setaf 4)"; }
+COLOR_RESET() { test -t 1 && echo -n "$(tput sgr 0)"; }
 
 function _test_git_scp()
 {

From 02a440953b8565d5d2039ec2e4eee2d918f479c0 Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Thu, 8 Oct 2015 14:06:46 +0800
Subject: [PATCH 19/57] replace wildcard '?' to literal '?'

Previously the `?` in the case statement will match any single letter.
As a result, `git scp a` will act as the same as `git scp -h`.
What we actually need is a literal '?'.
---
 bin/git-scp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/git-scp b/bin/git-scp
index e12c3c9a3..c9c2f2142 100755
--- a/bin/git-scp
+++ b/bin/git-scp
@@ -170,7 +170,7 @@ function _error()
 case $(basename $0) in
 	git-scp)
 		case $1 in
-			''|-h|?|help|--help) shift; _test_git_scp; _usage $@;;
+			''|-h|'?'|help|--help) shift; _test_git_scp; _usage $@;;
 			*)                   scp_and_stage $@;;
 		esac
 	;;

From 77f1c86b0d122a7b3f6fc0e1374cee47c069242d Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Thu, 8 Oct 2015 16:45:53 +0800
Subject: [PATCH 20/57] disable color if the output is not printed to tty

---
 bin/git-effort | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/bin/git-effort b/bin/git-effort
index e594f7187..0e79ed3f0 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -2,6 +2,8 @@
 
 tmp=$(git_extra_mktemp)
 above=0
+# if the output won't be printed to tty, disable the color
+test -t 1 && to_tty=true
 color=
 
 #
@@ -56,15 +58,19 @@ active_days() {
 #
 
 color_for() {
-  if   [ $1 -gt 200 ]; then color="$(tputq setaf 1)$(tputq bold)"
-  elif [ $1 -gt 150 ]; then color="$(tputq setaf 1)"  # red
-  elif [ $1 -gt 125 ]; then color="$(tputq setaf 2)$(tputq bold)"
-  elif [ $1 -gt 100 ]; then color="$(tputq setaf 2)"  # green
-  elif [ $1 -gt 75 ]; then color="$(tputq setaf 93)$(tputq bold)"
-  elif [ $1 -gt 50 ]; then color="$(tputq setaf 93)"  # purplish
-  elif [ $1 -gt 25 ]; then color="$(tputq setaf 3)$(tputq bold)"
-  elif [ $1 -gt 10 ]; then color="$(tputq setaf 3)"  # yellow
-  else color="$(tputq sgr0)" # default color
+  if [ "$to_tty" = true ]; then
+    if   [ $1 -gt 200 ]; then color="$(tputq setaf 1)$(tputq bold)"
+    elif [ $1 -gt 150 ]; then color="$(tputq setaf 1)"  # red
+    elif [ $1 -gt 125 ]; then color="$(tputq setaf 2)$(tputq bold)"
+    elif [ $1 -gt 100 ]; then color="$(tputq setaf 2)"  # green
+    elif [ $1 -gt 75 ]; then color="$(tputq setaf 93)$(tputq bold)"
+    elif [ $1 -gt 50 ]; then color="$(tputq setaf 93)"  # purplish
+    elif [ $1 -gt 25 ]; then color="$(tputq setaf 3)$(tputq bold)"
+    elif [ $1 -gt 10 ]; then color="$(tputq setaf 3)"  # yellow
+    else color="$(tputq sgr0)" # default color
+    fi
+  else
+    color=""
   fi
 }
 
@@ -76,7 +82,8 @@ effort() {
     path=$1
     local commit_dates
     local color reset_color commits len dot f_dot i msg active
-    reset_color="$(tputq sgr0)"
+    reset_color=""
+    test "$to_tty" = true && reset_color="$(tputq sgr0)"
     commit_dates=`dates "$path"`
     [ $? -gt 0 ] && exit 255
 
@@ -191,6 +198,7 @@ export -f color_for
 export -f active_days
 export -f dates
 export -f tputq
+export to_tty
 export above
 export log_args
 

From 4b795fc42fe621ca87dd6447a9d43a18ab43b90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Thu, 8 Oct 2015 16:13:27 -0400
Subject: [PATCH 21/57] add simple sed command

---
 Commands.md      |   5 ++
 bin/git-sed      |  69 +++++++++++++++++++++++
 man/git-sed.1    |  64 +++++++++++++++++++++
 man/git-sed.html | 144 +++++++++++++++++++++++++++++++++++++++++++++++
 man/git-sed.md   |  59 +++++++++++++++++++
 5 files changed, 341 insertions(+)
 create mode 100755 bin/git-sed
 create mode 100644 man/git-sed.1
 create mode 100644 man/git-sed.html
 create mode 100644 man/git-sed.md

diff --git a/Commands.md b/Commands.md
index 7da4fc758..9d4c79151 100644
--- a/Commands.md
+++ b/Commands.md
@@ -38,6 +38,7 @@
  - [`git reset-file`](#git-reset-file)
  - [`git root`](#git-root)
  - [`git scp`](#git-scp)
+ - [`git sed`](#git-sed)
  - [`git setup`](#git-setup)
  - [`git squash`](#git-squash)
  - [`git summary`](#git-summary)
@@ -700,6 +701,10 @@ Remove the latest 3 commits:
 git undo 3
 ```
 
+## git sed
+
+Run grep as directed but replace the given files with the pattern.
+
 ## git setup
 
 Set up a git repository (if one doesn't exist), add all files, and make an initial commit. `dir` defaults to the current working directory.
diff --git a/bin/git-sed b/bin/git-sed
new file mode 100755
index 000000000..966e6438a
--- /dev/null
+++ b/bin/git-sed
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+usage() {
+    cat <<EOF
+usage: git sed [ -c ] [ -f <flags> ] <search> <replacement>
+
+Run git grep and then send results to sed for replacement with the
+given flags, if -f is provided.
+
+Also runs git commit if -c is provided.
+EOF
+}
+
+# don't commit by default
+do_commit() {
+    true
+}
+
+while [ "X$1" != "X" ]; do
+    case "$1" in
+        -c|--commit)
+            if git status --porcelain | grep .; then
+                echo "you need to commit your changes before running with --commit"
+                exit 1
+            fi
+            do_commit() {
+                git commit -m"replace $search with $replacement
+
+actual command:
+
+    $command" -a
+            }
+            ;;
+        -f|--flags)
+            if [ "X$2" = "X" ]; then
+                usage
+                echo "missing argument for $1"
+                exit 1
+            fi
+            shift
+            flags=$1
+            ;;
+        -h|--help)
+            usage
+            exit
+            ;;
+        -*)
+            usage
+            echo "unkonwn flag: $1"
+            exit 1
+            ;;
+        *)
+            if [ "X$search" = "X" ]; then
+                search="$1"
+            elif [ "X$replacement" = "X" ]; then
+                replacement="$1"
+            else
+                usage
+                echo "too many arguments: $1"
+                exit 1
+            fi
+            ;;
+    esac
+    shift
+done
+
+command="git grep -l '$search' | xargs sed -i 's/$search/$replacement/$flags'"
+git grep -l "$search" | xargs sed -i "s/$search/$replacement/$flags"
+do_commit
diff --git a/man/git-sed.1 b/man/git-sed.1
new file mode 100644
index 000000000..f637cd25d
--- /dev/null
+++ b/man/git-sed.1
@@ -0,0 +1,64 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GIT\-SED" "1" "October 2015" "" ""
+.
+.SH "NAME"
+\fBgit\-sed\fR \- replace patterns in git\-controlled files
+.
+.SH "SYNOPSIS"
+\fBgit\-sed\fR [ \-c ] [ \-f \fIflags\fR ] \fIsearch\fR \fIreplacement\fR
+.
+.SH "DESCRIPTION"
+Run git grep and then send results to sed for replacement with the given flags, if \-f is provided\.
+.
+.P
+Also runs git commit if \-c is provided\.
+.
+.SH "OPTIONS"
+\-c
+.
+.P
+commit the resulting changes with a standard commit message detailing the exact command ran\. will fail if there are unstaged changes\.
+.
+.P
+\-f <flags>
+.
+.P
+will use the given regex flags in the sed command (for example "g" replaces multiple times on the same line)\.
+.
+.P
+<search>
+.
+.P
+the pattern passed to grep and to the first part of the sed expression\.
+.
+.P
+<replacement>
+.
+.P
+the replacement passed to sed, the second part of the sed expression\.
+.
+.SH "EXAMPLES"
+.
+.nf
+
+$ git sed \'my_function\' \'do_stuff\'
+# \.\.\. only does the changes, without committing
+$ git commit \-m"use proper function name"
+$ git sed \-c \'do_stuff\' \'stuff\'
+# \.\. does the changes and a commit
+$ git sed \-f g do_stuff stuff
+# \.\. g is actually pretty important, otherwise you will miss some
+# stuff!
+.
+.fi
+.
+.SH "AUTHOR"
+Written by Antoine Beaupré <\fIanarcat@debian\.org\fR> from inspiration by https://github\.com/da\-x/git\-search\-replace and http://stackoverflow\.com/questions/9651898/is\-there\-a\-git\-sed\-or\-equivalent
+.
+.SH "REPORTING BUGS"
+<\fIhttps://github\.com/tj/git\-extras/issues\fR>
+.
+.SH "SEE ALSO"
+<\fIhttps://github\.com/tj/git\-extras\fR>
diff --git a/man/git-sed.html b/man/git-sed.html
new file mode 100644
index 000000000..a89796d30
--- /dev/null
+++ b/man/git-sed.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' value='text/html;charset=utf8'>
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>git-sed(1) - replace patterns in git-controlled files</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#REPORTING-BUGS">REPORTING BUGS</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>git-sed(1)</li>
+    <li class='tc'></li>
+    <li class='tr'>git-sed(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>git-sed</code> - <span class="man-whatis">replace patterns in git-controlled files</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p><code>git-sed</code> [ -c ] [ -f <var>flags</var> ] <var>search</var> <var>replacement</var></p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>Run git grep and then send results to sed for replacement with the
+given flags, if -f is provided.</p>
+
+<p>Also runs git commit if -c is provided.</p>
+
+<h2 id="OPTIONS">OPTIONS</h2>
+
+<p>  -c</p>
+
+<p>  commit the resulting changes with a standard commit message
+  detailing the exact command ran. will fail if there are unstaged
+  changes.</p>
+
+<p>  -f &lt;flags&gt;</p>
+
+<p>  will use the given regex flags in the sed command (for example "g"
+  replaces multiple times on the same line).</p>
+
+<p>  &lt;search&gt;</p>
+
+<p>  the pattern passed to grep and to the first part of the sed expression.</p>
+
+<p>  &lt;replacement&gt;</p>
+
+<p>  the replacement passed to sed, the second part of the sed expression.</p>
+
+<h2 id="EXAMPLES">EXAMPLES</h2>
+
+<pre><code>$ git sed 'my_function' 'do_stuff'
+# ... only does the changes, without committing
+$ git commit -m"use proper function name"
+$ git sed -c 'do_stuff' 'stuff'
+# .. does the changes and a commit
+$ git sed -f g do_stuff stuff
+# .. g is actually pretty important, otherwise you will miss some
+# stuff!
+</code></pre>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>Written by Antoine Beaupré &lt;<a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#97;&#110;&#x61;&#114;&#99;&#97;&#x74;&#64;&#100;&#x65;&#98;&#x69;&#x61;&#110;&#x2e;&#111;&#x72;&#103;" data-bare-link="true">&#97;&#x6e;&#x61;&#114;&#99;&#97;&#116;&#x40;&#x64;&#x65;&#x62;&#105;&#97;&#110;&#46;&#111;&#114;&#x67;</a>&gt; from
+inspiration by https://github.com/da-x/git-search-replace and
+http://stackoverflow.com/questions/9651898/is-there-a-git-sed-or-equivalent</p>
+
+<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
+
+<p>&lt;<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>&gt;</p>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;</p>
+
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'></li>
+    <li class='tc'>October 2015</li>
+    <li class='tr'>git-sed(1)</li>
+  </ol>
+
+  </div>
+</body>
+</html>
diff --git a/man/git-sed.md b/man/git-sed.md
new file mode 100644
index 000000000..19d1f48fd
--- /dev/null
+++ b/man/git-sed.md
@@ -0,0 +1,59 @@
+git-sed(1) -- replace patterns in git-controlled files
+======================================================
+
+## SYNOPSIS
+
+`git-sed` [ -c ] [ -f <flags> ] <search> <replacement>
+
+## DESCRIPTION
+
+Run git grep and then send results to sed for replacement with the
+given flags, if -f is provided.
+
+Also runs git commit if -c is provided.
+
+## OPTIONS
+
+  -c
+
+  commit the resulting changes with a standard commit message
+  detailing the exact command ran. will fail if there are unstaged
+  changes.
+
+  -f &lt;flags&gt;
+
+  will use the given regex flags in the sed command (for example "g"
+  replaces multiple times on the same line).
+
+  &lt;search&gt;
+
+  the pattern passed to grep and to the first part of the sed expression.
+
+  &lt;replacement&gt;
+
+  the replacement passed to sed, the second part of the sed expression.
+
+## EXAMPLES
+
+    $ git sed 'my_function' 'do_stuff'
+    # ... only does the changes, without committing
+    $ git commit -m"use proper function name"
+    $ git sed -c 'do_stuff' 'stuff'
+    # .. does the changes and a commit
+    $ git sed -f g do_stuff stuff
+    # .. g is actually pretty important, otherwise you will miss some
+    # stuff!
+
+## AUTHOR
+
+Written by Antoine Beaupré &lt;<anarcat@debian.org>&gt; from
+inspiration by https://github.com/da-x/git-search-replace and
+http://stackoverflow.com/questions/9651898/is-there-a-git-sed-or-equivalent
+
+## REPORTING BUGS
+
+&lt;<https://github.com/tj/git-extras/issues>&gt;
+
+## SEE ALSO
+
+&lt;<https://github.com/tj/git-extras>&gt;

From 7f662708fa98af45ed081e4c642434454e70aceb Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Tue, 13 Oct 2015 23:54:52 +0800
Subject: [PATCH 22/57] use real purplish

---
 bin/git-effort | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/git-effort b/bin/git-effort
index 0e79ed3f0..c0ee24d81 100755
--- a/bin/git-effort
+++ b/bin/git-effort
@@ -63,8 +63,8 @@ color_for() {
     elif [ $1 -gt 150 ]; then color="$(tputq setaf 1)"  # red
     elif [ $1 -gt 125 ]; then color="$(tputq setaf 2)$(tputq bold)"
     elif [ $1 -gt 100 ]; then color="$(tputq setaf 2)"  # green
-    elif [ $1 -gt 75 ]; then color="$(tputq setaf 93)$(tputq bold)"
-    elif [ $1 -gt 50 ]; then color="$(tputq setaf 93)"  # purplish
+    elif [ $1 -gt 75 ]; then color="$(tputq setaf 5)$(tputq bold)"
+    elif [ $1 -gt 50 ]; then color="$(tputq setaf 5)"  # purplish
     elif [ $1 -gt 25 ]; then color="$(tputq setaf 3)$(tputq bold)"
     elif [ $1 -gt 10 ]; then color="$(tputq setaf 3)"  # yellow
     else color="$(tputq sgr0)" # default color

From 546ddf78af75ba9d8f378a0c88a00842d0775340 Mon Sep 17 00:00:00 2001
From: Jan Schulz <jasc@gmx.net>
Date: Sat, 17 Oct 2015 12:25:14 +0200
Subject: [PATCH 23/57] Use the default installation path in install.cmd

---
 install.cmd | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install.cmd b/install.cmd
index 1e1866539..727b937d6 100644
--- a/install.cmd
+++ b/install.cmd
@@ -1,5 +1,9 @@
 @ECHO OFF
 SET PREFIX=C:\SCM\PortableGit\mingw64
+:: default for Git for Windows 2.x
+@if exist "%ProgramFiles%\Git" (
+    set PREFIX="%ProgramFiles%\Git\mingw64"
+)
 IF NOT "%~1"=="" SET PREFIX="%~1"
 SET HTMLDIR=%PREFIX%\share\doc\git-doc
 SET GITEXTRAS=%~dp0

From 5a80928b89106699d6c214d435f4582e4039e3d0 Mon Sep 17 00:00:00 2001
From: Jan Schulz <jasc@gmx.net>
Date: Sat, 17 Oct 2015 12:30:40 +0200
Subject: [PATCH 24/57] git-changelog: option to only use merges

using `-m` or `--merges-only` will only show the merge
commit messages. It will also use the body of the merge
commit message in addition to the subject, as github merges
usually have a useless subject line for commit messages.

If used with `-n/--no-merges`, the last one specified will win.
---
 bin/git-changelog    | 21 ++++++++++++++++-----
 man/git-changelog.md |  4 ++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/bin/git-changelog b/bin/git-changelog
index f6df152d6..dc27a8b1d 100755
--- a/bin/git-changelog
+++ b/bin/git-changelog
@@ -4,6 +4,8 @@ DEF_TAG_RECENT="n.n.n"
 GIT_LOG_OPTS="$(git config changelog.opts)"
 GIT_LOG_FORMAT="$(git config changelog.format)"
 [[ -z "$GIT_LOG_FORMAT" ]] && GIT_LOG_FORMAT='  * %s'
+GIT_MERGELOG_FORMAT="$(git config changelog.mergeformat)"
+[[ -z "$GIT_MERGELOG_FORMAT" ]] && GIT_MERGELOG_FORMAT='  * %s%n%w(64,4,4)%b'
 GIT_EDITOR="$(git var GIT_EDITOR)"
 PROGNAME="git-changelog"
 
@@ -26,6 +28,7 @@ OPTIONS:
   -f, --final-tag           Newest tag to retrieve commits from in a range
   -s, --start-tag           Oldest tag to retrieve commits from in a range
   -n, --no-merges           Suppress commits from merged branches
+  -m, --merges-only         Only uses merge commits (uses both subject and body of commit)
   -p, --prune-old           Replace existing Changelog entirely with new content
   -x, --stdout              Write output to stdout instead of to a Changelog file
   -h, --help, ?             Show this message
@@ -143,13 +146,13 @@ _fetchCommitRange() {
   local final_tag="$3"
 
   if [[ "$list_all" == true ]]; then
-    git log $GIT_LOG_OPTS --pretty=format:"${GIT_LOG_FORMAT}"
+    git log $GIT_LOG_OPTS --pretty=format:"${CUR_GIT_LOG_FORMAT}"
   elif [[ -n "$final_tag" && "$start_tag" == "null" ]]; then
-    git log $GIT_LOG_OPTS --pretty=format:"${GIT_LOG_FORMAT}" "${final_tag}"
+    git log $GIT_LOG_OPTS --pretty=format:"${CUR_GIT_LOG_FORMAT}" "${final_tag}"
   elif [[ -n "$final_tag" ]]; then
-    git log $GIT_LOG_OPTS --pretty=format:"${GIT_LOG_FORMAT}" "${start_tag}"'..'"${final_tag}"
+    git log $GIT_LOG_OPTS --pretty=format:"${CUR_GIT_LOG_FORMAT}" "${start_tag}"'..'"${final_tag}"
   elif [[ -n "$start_tag" ]]; then
-    git log $GIT_LOG_OPTS --pretty=format:"${GIT_LOG_FORMAT}" "${start_tag}"'..'
+    git log $GIT_LOG_OPTS --pretty=format:"${CUR_GIT_LOG_FORMAT}" "${start_tag}"'..'
   fi | sed 's/^  \* \*/  */g'
 }
 
@@ -375,6 +378,11 @@ main() {
         ;;
       -n | --no-merges )
         GIT_LOG_OPTS='--no-merges'
+        CUR_GIT_LOG_FORMAT="$GIT_LOG_FORMAT"
+        ;;
+      -m | --merges-only )
+        GIT_LOG_OPTS='--merges'
+        CUR_GIT_LOG_FORMAT="$GIT_MERGELOG_FORMAT"
         ;;
       -p | --prune-old )
         option=( $(_setValueForKeyFakeAssocArray "prune_old" true "${option[*]}") )
@@ -393,7 +401,10 @@ main() {
     esac
     shift
   done
-
+  
+  # The default log format unless already set
+  [[ -z "$CUR_GIT_LOG_FORMAT" ]] && CUR_GIT_LOG_FORMAT="$GIT_LOG_FORMAT"
+  
   local _tag="$(_valueForKeyFakeAssocArray "start_tag" "${option[*]}")"
   if [[ -n "${_tag}" ]]; then
     start_tag="$(git describe --tags --abbrev=0 "${_tag}" 2>/dev/null)"
diff --git a/man/git-changelog.md b/man/git-changelog.md
index 12f3f6588..3dd650763 100644
--- a/man/git-changelog.md
+++ b/man/git-changelog.md
@@ -42,6 +42,10 @@ git-changelog(1) -- Generate a changelog report
 
   Filters out merge commits (commits with more than 1 parent) from generated changelog.
 
+  -m, --merges-only
+
+  Uses only merge commits (commits with more than 1 parent) for generated changelog. It also changes the default format to include the merge commit messages body, as on github the commits subject line only contains the branch name but no information about the content of the merge. 
+
   -p, --prune-old
 
   Replace existing changelog entirely with newly generated content, thereby disabling the default behavior of appending the content of any detected changelog to the end of newly generated content.

From 106acae94377a05ca754985a819063ffff1158f9 Mon Sep 17 00:00:00 2001
From: Nimit Kalra <nimit@nimitkalra.com>
Date: Sun, 18 Oct 2015 13:44:13 -0500
Subject: [PATCH 25/57] Regenerate git-changelog man pages (.html and .1) for
 #471.

---
 man/git-changelog.1    |  8 +++++++-
 man/git-changelog.html | 10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/man/git-changelog.1 b/man/git-changelog.1
index 46a409384..023ad322c 100644
--- a/man/git-changelog.1
+++ b/man/git-changelog.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-CHANGELOG" "1" "April 2015" "" ""
+.TH "GIT\-CHANGELOG" "1" "October 2015" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-changelog\fR \- Generate a changelog report
@@ -61,6 +61,12 @@ When specifying a range, the oldest tag to retrieve commits from\. Commits will
 Filters out merge commits (commits with more than 1 parent) from generated changelog\.
 .
 .P
+\-m, \-\-merges\-only
+.
+.P
+Uses only merge commits (commits with more than 1 parent) for generated changelog\. It also changes the default format to include the merge commit messages body, as on github the commits subject line only contains the branch name but no information about the content of the merge\.
+.
+.P
 \-p, \-\-prune\-old
 .
 .P
diff --git a/man/git-changelog.html b/man/git-changelog.html
index 14b39a55c..ef6bc11e2 100644
--- a/man/git-changelog.html
+++ b/man/git-changelog.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-changelog(1)</li>
-    <li class='tc'></li>
+    <li class='tc'>Git Extras</li>
     <li class='tr'>git-changelog(1)</li>
   </ol>
 
@@ -115,6 +115,10 @@ <h2 id="OPTIONS">OPTIONS</h2>
 
 <p>  Filters out merge commits (commits with more than 1 parent) from generated changelog.</p>
 
+<p>  -m, --merges-only</p>
+
+<p>  Uses only merge commits (commits with more than 1 parent) for generated changelog. It also changes the default format to include the merge commit messages body, as on github the commits subject line only contains the branch name but no information about the content of the merge.</p>
+
 <p>  -p, --prune-old</p>
 
 <p>  Replace existing changelog entirely with newly generated content, thereby disabling the default behavior of appending the content of any detected changelog to the end of newly generated content.</p>
@@ -159,7 +163,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Mark Eissler &lt;<a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x6d;&#x61;&#x72;&#x6b;&#64;&#x6d;&#x69;&#120;&#x74;&#x75;&#114;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#109;&#x61;&#x72;&#107;&#64;&#109;&#x69;&#x78;&#116;&#117;&#x72;&#x2e;&#x63;&#111;&#109;</a>&gt;</p>
+<p>Written by Mark Eissler &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#109;&#x61;&#x72;&#107;&#64;&#x6d;&#105;&#120;&#116;&#x75;&#x72;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#109;&#97;&#114;&#x6b;&#x40;&#109;&#105;&#x78;&#x74;&#117;&#114;&#46;&#99;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -172,7 +176,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>October 2015</li>
     <li class='tr'>git-changelog(1)</li>
   </ol>
 

From b4f4dd1197c69385cebf5bb1e9943a05cd7fe7ee Mon Sep 17 00:00:00 2001
From: Jan Schulz <jasc@gmx.net>
Date: Thu, 22 Oct 2015 10:35:24 +0200
Subject: [PATCH 26/57] Add more info how to set global gitignore

---
 bin/git-ignore | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bin/git-ignore b/bin/git-ignore
index f710bedd7..85bd5e417 100755
--- a/bin/git-ignore
+++ b/bin/git-ignore
@@ -14,7 +14,15 @@ function show_global {
 }
 
 function add_global {
-  add_patterns `git config --global core.excludesfile` "$@"
+  local global_gitignore=$(git config --global core.excludesfile)
+  if [ -z "$global_gitignore" ]; then
+    echo "Can't find global .gitignore."
+    echo ""
+    echo "Use 'git config --global --add core.excludesfile ~/.gitignore-global' to set the path to your global gitignore file to '~/.gitignore-global'."
+    echo ""
+  else
+    add_patterns `git config --global core.excludesfile` "$@"
+  fi
 }
 
 function show_local {

From 91ca995edc4d360e5b3b71987d9bf10d65c4e4d4 Mon Sep 17 00:00:00 2001
From: Nimit Kalra <nimit@nimitkalra.com>
Date: Sun, 27 Dec 2015 11:26:38 -0600
Subject: [PATCH 27/57] Update all man pages.

---
 man/git-alias.1                               |   2 +-
 man/git-alias.1.html                          | 145 ------------------
 man/git-alias.html                            |  10 +-
 man/git-archive-file.1                        |   2 +-
 man/git-archive-file.html                     |   4 +-
 man/git-authors.1                             |  19 ++-
 man/git-authors.html                          |   9 +-
 man/git-back.1                                |   2 +-
 man/git-back.html                             |   4 +-
 man/git-bug.1                                 |   2 +-
 man/git-bug.html                              |   4 +-
 man/git-changelog.1                           |   2 +-
 man/git-changelog.html                        |   6 +-
 man/git-chore.1                               |   2 +-
 man/git-chore.html                            |   4 +-
 man/git-clear.1                               |  23 +--
 man/git-clear.html                            |  17 +-
 man/git-commits-since.1                       |   2 +-
 man/git-commits-since.html                    |   4 +-
 man/git-contrib.1                             |   2 +-
 man/git-contrib.html                          |   6 +-
 man/git-count.1                               |   2 +-
 man/git-count.html                            |   4 +-
 man/git-create-branch.1                       |   2 +-
 man/git-create-branch.html                    |   4 +-
 man/git-delete-branch.1                       |   2 +-
 man/git-delete-branch.html                    |   4 +-
 man/git-delete-merged-branches.1              |   2 +-
 man/git-delete-merged-branches.html           |   4 +-
 man/git-delete-submodule.1                    |   2 +-
 man/git-delete-submodule.html                 |   4 +-
 man/git-delete-tag.1                          |   2 +-
 man/git-delete-tag.html                       |   4 +-
 man/git-delta.1                               |   2 +-
 man/git-delta.html                            |   4 +-
 man/git-effort.1                              |   2 +-
 man/git-effort.html                           |   6 +-
 man/git-extras.1                              |  16 +-
 man/git-extras.html                           |  10 +-
 man/git-extras.md                             |   6 +-
 man/git-feature.1                             |   2 +-
 man/git-feature.1.html                        | 136 ----------------
 man/git-feature.html                          |  26 +++-
 man/git-fork.1                                |   2 +-
 man/git-fork.html                             |  12 +-
 man/git-fresh-branch.1                        |   2 +-
 man/git-fresh-branch.html                     |   4 +-
 man/git-gh-pages.1                            |   2 +-
 man/git-gh-pages.html                         |   4 +-
 man/git-graft.1                               |   2 +-
 man/git-graft.html                            |   6 +-
 man/git-guilt.1                               |   2 +-
 man/git-guilt.html                            |   6 +-
 man/git-ignore-io.1                           |   2 +-
 ...it-ignore-io.1.html => git-ignore-io.html} |   4 +-
 man/git-ignore.1                              |   2 +-
 man/git-ignore.html                           |   6 +-
 man/git-info.1                                |   2 +-
 man/git-info.html                             |   4 +-
 man/git-line-summary.1                        |   2 +-
 man/git-line-summary.html                     |   4 +-
 man/git-local-commits.1                       |   2 +-
 man/git-local-commits.html                    |   4 +-
 man/git-lock.1                                |   2 +-
 man/git-lock.html                             |   4 +-
 man/git-locked.1                              |   2 +-
 man/git-locked.html                           |   4 +-
 man/git-merge-into.1                          |   2 +-
 man/git-merge-into.html                       |   6 +-
 man/git-merge-repo.1                          |   2 +-
 man/git-merge-repo.html                       |   4 +-
 man/git-missing.1                             |   2 +-
 man/git-missing.html                          |   4 +-
 man/git-pr.1                                  |   2 +-
 man/git-pr.html                               |   2 +-
 man/git-psykorebase.1                         |   2 +-
 man/git-psykorebase.html                      |   6 +-
 man/git-rebase-patch.1                        |   2 +-
 man/git-rebase-patch.html                     |   4 +-
 man/git-refactor.1                            |   2 +-
 man/git-refactor.html                         |   4 +-
 man/git-release.1                             |   2 +-
 man/git-release.html                          |   6 +-
 man/git-rename-tag.1                          |   2 +-
 man/git-rename-tag.html                       |   4 +-
 man/git-repl.1                                |   2 +-
 man/git-repl.html                             |   4 +-
 man/git-reset-file.1                          |   2 +-
 man/git-reset-file.html                       |   4 +-
 man/git-root.1                                |   2 +-
 man/git-root.html                             |   4 +-
 man/git-scp.1                                 |   2 +-
 man/git-scp.html                              |   4 +-
 man/git-sed.1                                 |   2 +-
 man/git-sed.html                              |   4 +-
 man/git-setup.1                               |   2 +-
 man/git-setup.html                            |   4 +-
 man/git-show-merged-branches.1                |   2 +-
 man/git-show-merged-branches.html             |   4 +-
 man/git-show-tree.1                           |   2 +-
 man/git-show-tree.html                        |   4 +-
 man/git-show-unmerged-branches.1              |   2 +-
 man/git-show-unmerged-branches.html           |   4 +-
 man/git-squash.1                              |   2 +-
 man/git-squash.html                           |   4 +-
 man/git-summary.1                             |   2 +-
 man/git-summary.html                          |   6 +-
 man/git-touch.1                               |   2 +-
 man/git-touch.html                            |   4 +-
 man/git-undo.1                                |   2 +-
 man/git-undo.html                             |   4 +-
 man/git-unlock.1                              |   2 +-
 man/git-unlock.html                           |   4 +-
 man/index.txt                                 |   4 +
 114 files changed, 249 insertions(+), 502 deletions(-)
 delete mode 100644 man/git-alias.1.html
 delete mode 100644 man/git-feature.1.html
 rename man/{git-ignore-io.1.html => git-ignore-io.html} (93%)

diff --git a/man/git-alias.1 b/man/git-alias.1
index d009922b7..06806b285 100644
--- a/man/git-alias.1
+++ b/man/git-alias.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-ALIAS" "1" "August 2015" "" ""
+.TH "GIT\-ALIAS" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-alias\fR \- Define, search and show aliases
diff --git a/man/git-alias.1.html b/man/git-alias.1.html
deleted file mode 100644
index 384b4e927..000000000
--- a/man/git-alias.1.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
-  <title>git-alias(1) - Define, search and show aliases</title>
-  <style type='text/css' media='all'>
-  /* style: man */
-  body#manpage {margin:0}
-  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
-  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
-  .mp h2 {margin:10px 0 0 0}
-  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
-  .mp h3 {margin:0 0 0 4ex}
-  .mp dt {margin:0;clear:left}
-  .mp dt.flush {float:left;width:8ex}
-  .mp dd {margin:0 0 0 9ex}
-  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
-  .mp pre {margin-bottom:20px}
-  .mp pre+h2,.mp pre+h3 {margin-top:22px}
-  .mp h2+pre,.mp h3+pre {margin-top:5px}
-  .mp img {display:block;margin:auto}
-  .mp h1.man-title {display:none}
-  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
-  .mp h2 {font-size:16px;line-height:1.25}
-  .mp h1 {font-size:20px;line-height:2}
-  .mp {text-align:justify;background:#fff}
-  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
-  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
-  .mp u {text-decoration:underline}
-  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
-  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
-  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
-  .mp b.man-ref {font-weight:normal;color:#434241}
-  .mp pre {padding:0 4ex}
-  .mp pre code {font-weight:normal;color:#434241}
-  .mp h2+pre,h3+pre {padding-left:0}
-  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
-  ol.man-decor {width:100%}
-  ol.man-decor li.tl {text-align:left}
-  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
-  ol.man-decor li.tr {text-align:right;float:right}
-  </style>
-</head>
-<!--
-  The following styles are deprecated and will be removed at some point:
-  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
-
-  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
-  .man-navigation should be used instead.
--->
-<body id='manpage'>
-  <div class='mp' id='man'>
-
-  <div class='man-navigation' style='display:none'>
-    <a href="#NAME">NAME</a>
-    <a href="#SYNOPSIS">SYNOPSIS</a>
-    <a href="#DESCRIPTION">DESCRIPTION</a>
-    <a href="#OPTIONS">OPTIONS</a>
-    <a href="#EXAMPLES">EXAMPLES</a>
-    <a href="#AUTHOR">AUTHOR</a>
-    <a href="#REPORTING-BUGS">REPORTING BUGS</a>
-    <a href="#SEE-ALSO">SEE ALSO</a>
-  </div>
-
-  <ol class='man-decor man-head man head'>
-    <li class='tl'>git-alias(1)</li>
-    <li class='tc'></li>
-    <li class='tr'>git-alias(1)</li>
-  </ol>
-
-  <h2 id="NAME">NAME</h2>
-<p class="man-name">
-  <code>git-alias</code> - <span class="man-whatis">Define, search and show aliases</span>
-</p>
-
-<h2 id="SYNOPSIS">SYNOPSIS</h2>
-
-<p><code>git-alias</code><br />
-<code>git-alias</code> &lt;search-pattern&gt;<br />
-<code>git-alias</code> &lt;alias-name&gt; &lt;command&gt;</p>
-
-<h2 id="DESCRIPTION">DESCRIPTION</h2>
-
-<p>  List all aliases, show one alias, or set one (global) alias.</p>
-
-<h2 id="OPTIONS">OPTIONS</h2>
-
-<p>  &lt;search-pattern&gt;</p>
-
-<p>  The pattern used to search aliases.</p>
-
-<p>  &lt;alias-name&gt;</p>
-
-<p>  The name of the alias to create.</p>
-
-<p>  &lt;command&gt;</p>
-
-<p>  The command for which you are creating an alias.</p>
-
-<h2 id="EXAMPLES">EXAMPLES</h2>
-
-<p> Defining a new alias:</p>
-
-<pre><code>$ git alias last "cat-file commit HEAD"
-</code></pre>
-
-<p> Providing only one argument, <code>git-alias</code> searchs for aliases matching the given value:</p>
-
-<pre><code>$ git alias ^la
-last = cat-file commit HEAD
-</code></pre>
-
-<p> <code>git-alias</code> will show all aliases if no argument is given:</p>
-
-<pre><code>$ git alias
-s = status
-amend = commit --amend
-rank = shortlog -sn --no-merges
-whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
-whois = !sh -c 'git log -i -1 --pretty="format:%an &lt;%ae>
-</code></pre>
-
-<h2 id="AUTHOR">AUTHOR</h2>
-
-<p>Written by Jonhnny Weslley &lt;<a href="&#109;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#x6a;&#x77;&#64;&#106;&#x6f;&#x6e;&#104;&#110;&#x6e;&#121;&#119;&#101;&#115;&#108;&#108;&#x65;&#x79;&#46;&#x6e;&#101;&#116;" data-bare-link="true">&#x6a;&#x77;&#x40;&#x6a;&#x6f;&#110;&#104;&#x6e;&#110;&#x79;&#119;&#x65;&#115;&#108;&#108;&#x65;&#121;&#x2e;&#110;&#101;&#x74;</a>&gt;</p>
-
-<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
-
-<p>&lt;<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>&gt;</p>
-
-<h2 id="SEE-ALSO">SEE ALSO</h2>
-
-<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;</p>
-
-
-  <ol class='man-decor man-foot man foot'>
-    <li class='tl'></li>
-    <li class='tc'>August 2015</li>
-    <li class='tr'>git-alias(1)</li>
-  </ol>
-
-  </div>
-</body>
-</html>
diff --git a/man/git-alias.html b/man/git-alias.html
index e65783707..e00864a24 100644
--- a/man/git-alias.html
+++ b/man/git-alias.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-alias(1)</li>
-    <li class='tc'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-alias(1)</li>
   </ol>
 
@@ -77,7 +77,7 @@ <h2 id="NAME">NAME</h2>
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <p><code>git-alias</code><br />
-<code>git-alias</code> &lt;search-term&gt;<br />
+<code>git-alias</code> &lt;search-pattern&gt;<br />
 <code>git-alias</code> &lt;alias-name&gt; &lt;command&gt;</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
@@ -86,7 +86,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
-<p>  &lt;search-term&gt;</p>
+<p>  &lt;search-pattern&gt;</p>
 
 <p>  The pattern used to search aliases.</p>
 
@@ -123,7 +123,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jonhnny Weslley &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#106;&#119;&#64;&#106;&#111;&#x6e;&#104;&#x6e;&#110;&#121;&#119;&#x65;&#115;&#108;&#x6c;&#x65;&#x79;&#x2e;&#110;&#101;&#116;" data-bare-link="true">&#106;&#119;&#64;&#x6a;&#111;&#x6e;&#104;&#110;&#110;&#121;&#x77;&#101;&#115;&#x6c;&#108;&#x65;&#121;&#x2e;&#110;&#101;&#116;</a>&gt;</p>
+<p>Written by Jonhnny Weslley &lt;<a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#106;&#x77;&#x40;&#106;&#111;&#x6e;&#x68;&#x6e;&#x6e;&#x79;&#119;&#101;&#x73;&#x6c;&#108;&#x65;&#x79;&#46;&#110;&#x65;&#x74;" data-bare-link="true">&#x6a;&#119;&#x40;&#x6a;&#111;&#110;&#x68;&#110;&#110;&#121;&#119;&#x65;&#x73;&#108;&#x6c;&#x65;&#121;&#46;&#110;&#x65;&#x74;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -136,7 +136,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-alias(1)</li>
   </ol>
 
diff --git a/man/git-archive-file.1 b/man/git-archive-file.1
index bf84acba0..484657713 100644
--- a/man/git-archive-file.1
+++ b/man/git-archive-file.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-ARCHIVE\-FILE" "1" "April 2015" "" ""
+.TH "GIT\-ARCHIVE\-FILE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-archive\-file\fR \- Export the current HEAD of the git repository to a archive
diff --git a/man/git-archive-file.html b/man/git-archive-file.html
index b55728b8a..bcd98a468 100644
--- a/man/git-archive-file.html
+++ b/man/git-archive-file.html
@@ -98,7 +98,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Philipp Klose &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#x6d;&#101;&#x40;&#116;&#x68;&#x65;&#104;&#105;&#112;&#112;&#x6f;&#46;&#100;&#x65;" data-bare-link="true">&#109;&#x65;&#64;&#x74;&#x68;&#x65;&#104;&#x69;&#112;&#112;&#111;&#x2e;&#100;&#x65;</a>&gt;</p>
+<p>Written by Philipp Klose &lt;<a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#109;&#x65;&#x40;&#116;&#104;&#x65;&#x68;&#x69;&#x70;&#x70;&#111;&#46;&#x64;&#x65;" data-bare-link="true">&#109;&#x65;&#x40;&#116;&#104;&#x65;&#x68;&#x69;&#112;&#x70;&#x6f;&#46;&#100;&#x65;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -111,7 +111,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-archive-file(1)</li>
   </ol>
 
diff --git a/man/git-authors.1 b/man/git-authors.1
index 15f1d1e58..391b77218 100644
--- a/man/git-authors.1
+++ b/man/git-authors.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-AUTHORS" "1" "April 2015" "" ""
+.TH "GIT\-AUTHORS" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-authors\fR \- Generate authors report
@@ -35,8 +35,21 @@ Listing authors:
 .IP
 $ git authors \-\-list
 .
-.IP
-\fBTJ Holowaychuk <tj@vision\-media\.ca> Tj Holowaychuk <tj@vision\-media\.ca> hemanth\.hm <hemanth\.hm@gmail\.com> Jonhnny Weslley <jw@jonhnnyweslley\.net> nickl\- <github@jigsoft\.co\.za> Leila Muhtasib <muhtasib@gmail\.com>\fR
+.IP "" 4
+.
+.nf
+
+TJ Holowaychuk <tj@vision\-media\.ca>
+Tj Holowaychuk <tj@vision\-media\.ca>
+hemanth\.hm <hemanth\.hm@gmail\.com>
+Jonhnny Weslley <jw@jonhnnyweslley\.net>
+nickl\- <github@jigsoft\.co\.za>
+Leila Muhtasib <muhtasib@gmail\.com>
+.
+.fi
+.
+.IP "" 0
+
 .
 .SH "AUTHOR"
 Written by Titus Wormer <\fItituswormer@gmail\.com\fR>
diff --git a/man/git-authors.html b/man/git-authors.html
index de18ecf44..d67bf7f4a 100644
--- a/man/git-authors.html
+++ b/man/git-authors.html
@@ -101,20 +101,19 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <p>$ git authors --list</p>
 
-<p><code>
-TJ Holowaychuk &lt;tj@vision-media.ca&gt;
+<pre><code>TJ Holowaychuk &lt;tj@vision-media.ca&gt;
 Tj Holowaychuk &lt;tj@vision-media.ca&gt;
 hemanth.hm &lt;hemanth.hm@gmail.com&gt;
 Jonhnny Weslley &lt;jw@jonhnnyweslley.net&gt;
 nickl- &lt;github@jigsoft.co.za&gt;
 Leila Muhtasib &lt;muhtasib@gmail.com&gt;
-</code></p></dd>
+</code></pre></dd>
 </dl>
 
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Titus Wormer &lt;<a href="&#109;&#97;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x74;&#x69;&#116;&#117;&#115;&#119;&#x6f;&#x72;&#109;&#101;&#x72;&#x40;&#x67;&#109;&#97;&#x69;&#x6c;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x74;&#105;&#116;&#x75;&#115;&#x77;&#111;&#x72;&#x6d;&#101;&#114;&#x40;&#103;&#x6d;&#x61;&#105;&#108;&#x2e;&#99;&#111;&#109;</a>&gt;</p>
+<p>Written by Titus Wormer &lt;<a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#116;&#x69;&#x74;&#117;&#115;&#x77;&#x6f;&#x72;&#x6d;&#x65;&#114;&#64;&#x67;&#x6d;&#97;&#x69;&#x6c;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x74;&#105;&#x74;&#x75;&#115;&#119;&#x6f;&#114;&#109;&#101;&#114;&#x40;&#x67;&#109;&#x61;&#x69;&#108;&#46;&#99;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -127,7 +126,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-authors(1)</li>
   </ol>
 
diff --git a/man/git-back.1 b/man/git-back.1
index b06cc94ac..b88a83d30 100644
--- a/man/git-back.1
+++ b/man/git-back.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-BACK" "1" "April 2015" "" ""
+.TH "GIT\-BACK" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-back\fR \- Undo and Stage latest commits
diff --git a/man/git-back.html b/man/git-back.html
index abe392c09..8ff46e64f 100644
--- a/man/git-back.html
+++ b/man/git-back.html
@@ -102,7 +102,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Kenneth Reitz &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#x6d;&#101;&#x40;&#107;&#x65;&#x6e;&#110;&#101;&#116;&#104;&#x72;&#101;&#105;&#x74;&#122;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x6d;&#101;&#x40;&#107;&#101;&#110;&#x6e;&#101;&#x74;&#104;&#114;&#101;&#x69;&#116;&#x7a;&#46;&#99;&#111;&#109;</a>&gt;</p>
+<p>Written by Kenneth Reitz &lt;<a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#109;&#x65;&#x40;&#107;&#101;&#x6e;&#x6e;&#x65;&#x74;&#x68;&#114;&#101;&#x69;&#x74;&#122;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x6d;&#x65;&#x40;&#107;&#x65;&#x6e;&#110;&#101;&#x74;&#104;&#114;&#101;&#105;&#x74;&#x7a;&#46;&#x63;&#x6f;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -115,7 +115,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-back(1)</li>
   </ol>
 
diff --git a/man/git-bug.1 b/man/git-bug.1
index 51606f8bf..bf3670a4c 100644
--- a/man/git-bug.1
+++ b/man/git-bug.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-BUG" "1" "April 2015" "" ""
+.TH "GIT\-BUG" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-bug\fR \- Create bug branch
diff --git a/man/git-bug.html b/man/git-bug.html
index 2c5fb6fb6..b7c091790 100644
--- a/man/git-bug.html
+++ b/man/git-bug.html
@@ -104,7 +104,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jesús Espino &lt;<a href="&#109;&#97;&#105;&#x6c;&#116;&#x6f;&#x3a;&#106;&#101;&#115;&#x70;&#x69;&#x6e;&#x6f;&#103;&#x40;&#103;&#x6d;&#x61;&#105;&#108;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x6a;&#101;&#115;&#112;&#105;&#110;&#x6f;&#103;&#x40;&#103;&#109;&#97;&#x69;&#x6c;&#x2e;&#x63;&#111;&#109;</a>&gt;</p>
+<p>Written by Jesús Espino &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#111;&#x3a;&#x6a;&#101;&#115;&#x70;&#105;&#110;&#111;&#x67;&#64;&#x67;&#109;&#97;&#105;&#x6c;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#101;&#x73;&#112;&#x69;&#110;&#x6f;&#x67;&#x40;&#x67;&#x6d;&#x61;&#105;&#108;&#46;&#99;&#x6f;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -117,7 +117,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-bug(1)</li>
   </ol>
 
diff --git a/man/git-changelog.1 b/man/git-changelog.1
index 023ad322c..e14c53790 100644
--- a/man/git-changelog.1
+++ b/man/git-changelog.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-CHANGELOG" "1" "October 2015" "" "Git Extras"
+.TH "GIT\-CHANGELOG" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-changelog\fR \- Generate a changelog report
diff --git a/man/git-changelog.html b/man/git-changelog.html
index ef6bc11e2..dca780d6a 100644
--- a/man/git-changelog.html
+++ b/man/git-changelog.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-changelog(1)</li>
-    <li class='tc'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-changelog(1)</li>
   </ol>
 
@@ -163,7 +163,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Mark Eissler &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#109;&#x61;&#x72;&#107;&#64;&#x6d;&#105;&#120;&#116;&#x75;&#x72;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#109;&#97;&#114;&#x6b;&#x40;&#109;&#105;&#x78;&#x74;&#117;&#114;&#46;&#99;&#111;&#109;</a>&gt;</p>
+<p>Written by Mark Eissler &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#109;&#x61;&#x72;&#x6b;&#64;&#x6d;&#x69;&#x78;&#116;&#117;&#114;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6d;&#97;&#114;&#x6b;&#64;&#109;&#x69;&#x78;&#116;&#117;&#114;&#x2e;&#x63;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -176,7 +176,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>October 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-changelog(1)</li>
   </ol>
 
diff --git a/man/git-chore.1 b/man/git-chore.1
index 783a78cc5..d557f465b 100644
--- a/man/git-chore.1
+++ b/man/git-chore.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-CHORE" "1" "April 2015" "" ""
+.TH "GIT\-CHORE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-chore\fR \- Create chore branch
diff --git a/man/git-chore.html b/man/git-chore.html
index bce74474f..cbe6b0777 100644
--- a/man/git-chore.html
+++ b/man/git-chore.html
@@ -104,7 +104,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Chris Hall &lt;<a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#58;&#x63;&#x68;&#114;&#105;&#115;&#116;&#111;&#x70;&#104;&#101;&#x72;&#46;&#x6b;&#x2e;&#x68;&#x61;&#x6c;&#108;&#x40;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#99;&#x68;&#114;&#x69;&#x73;&#116;&#x6f;&#x70;&#104;&#x65;&#114;&#x2e;&#x6b;&#x2e;&#x68;&#97;&#x6c;&#108;&#64;&#103;&#109;&#x61;&#x69;&#108;&#x2e;&#x63;&#111;&#109;</a>&gt; from bug/feature/refactor comamnds originally written by Jesús Espino &lt;<a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#106;&#x65;&#x73;&#x70;&#x69;&#110;&#111;&#103;&#64;&#x67;&#x6d;&#97;&#105;&#x6c;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#x65;&#x73;&#x70;&#105;&#x6e;&#111;&#103;&#64;&#x67;&#x6d;&#97;&#x69;&#108;&#x2e;&#99;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Chris Hall &lt;<a href="&#x6d;&#97;&#x69;&#108;&#x74;&#111;&#58;&#x63;&#104;&#x72;&#105;&#x73;&#x74;&#x6f;&#x70;&#x68;&#x65;&#114;&#46;&#107;&#46;&#x68;&#97;&#108;&#108;&#x40;&#103;&#x6d;&#97;&#105;&#x6c;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x63;&#x68;&#x72;&#x69;&#115;&#116;&#x6f;&#x70;&#x68;&#101;&#114;&#46;&#107;&#46;&#x68;&#97;&#108;&#108;&#64;&#103;&#109;&#97;&#105;&#108;&#46;&#x63;&#x6f;&#x6d;</a>&gt; from bug/feature/refactor comamnds originally written by Jesús Espino &lt;<a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#58;&#106;&#101;&#x73;&#x70;&#105;&#x6e;&#111;&#103;&#x40;&#103;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#106;&#101;&#115;&#x70;&#105;&#x6e;&#111;&#103;&#x40;&#x67;&#109;&#x61;&#x69;&#108;&#46;&#99;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -117,7 +117,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-chore(1)</li>
   </ol>
 
diff --git a/man/git-clear.1 b/man/git-clear.1
index 44f961ace..15a5bb1c6 100644
--- a/man/git-clear.1
+++ b/man/git-clear.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-CLEAR" "1" "August 2015" "" ""
+.TH "GIT\-CLEAR" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-clear\fR \- Rigorously clean up a repository
@@ -10,9 +10,7 @@
 \fBgit\-clear\fR
 .
 .SH "DESCRIPTION"
-Clears the repository to a state that it looks as if it was freshly cloned
-with the current HEAD. Basically it is a git-reset --hard together with
-deletion of all untracked files that reside inside the working directory.
+Clears the repository to a state that it looks as if it was freshly cloned with the current HEAD\. Basically it is a git\-reset \-\-hard together with deletion of all untracked files that reside inside the working directory\.
 .
 .SH "EXAMPLES"
 Clears the repo\.
@@ -21,27 +19,14 @@ Clears the repo\.
 .
 .nf
 
-$ git clear 
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Remove the latest 3 commits:
-.
-.IP "" 4
-.
-.nf
-
-$ git back 3
+$ git clear
 .
 .fi
 .
 .IP "" 0
 .
 .SH "AUTHOR"
-Written by Daniel Brendle <\fIgrindhold@gmx\.net\fR>
+Written by Daniel \'grindhold\' Brendle <\fIgrindhold@gmx\.net\fR>
 .
 .SH "REPORTING BUGS"
 <\fIhttps://github\.com/tj/git\-extras/issues\fR>
diff --git a/man/git-clear.html b/man/git-clear.html
index fd7c6b831..4002b5492 100644
--- a/man/git-clear.html
+++ b/man/git-clear.html
@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
   <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
-  <title>git-clear(1) - Undo and Stage latest commits</title>
+  <title>git-clear(1) - Rigorously clean up a repository </title>
   <style type='text/css' media='all'>
   /* style: man */
   body#manpage {margin:0}
@@ -56,7 +56,6 @@
     <a href="#NAME">NAME</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#DESCRIPTION">DESCRIPTION</a>
-    <a href="#OPTIONS">OPTIONS</a>
     <a href="#EXAMPLES">EXAMPLES</a>
     <a href="#AUTHOR">AUTHOR</a>
     <a href="#REPORTING-BUGS">REPORTING BUGS</a>
@@ -71,7 +70,7 @@
 
   <h2 id="NAME">NAME</h2>
 <p class="man-name">
-  <code>git-clear</code> - <span class="man-whatis">Rigorously clean up a repository</span>
+  <code>git-clear</code> - <span class="man-whatis">Rigorously clean up a repository </span>
 </p>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
@@ -80,11 +79,9 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>
-Clears the repository to a state that it looks as if it was freshly cloned
-with the current HEAD. Basically it is a git-reset --hard together with
-deletion of all untracked files that reside inside the working directory.
-</p>
+<p>  Clears the repository to a state that it looks as if it was freshly cloned
+  with the current HEAD. Basically it is a git-reset --hard together with
+  deletion of all untracked files that reside inside the working directory.</p>
 
 <h2 id="EXAMPLES">EXAMPLES</h2>
 
@@ -95,7 +92,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Daniel 'grindhold' Brendle</p>
+<p>Written by Daniel 'grindhold' Brendle &lt;<a href="&#x6d;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#103;&#x72;&#x69;&#110;&#100;&#x68;&#111;&#108;&#100;&#x40;&#103;&#x6d;&#120;&#46;&#110;&#x65;&#116;" data-bare-link="true">&#x67;&#114;&#x69;&#110;&#100;&#x68;&#111;&#x6c;&#100;&#x40;&#x67;&#x6d;&#x78;&#x2e;&#x6e;&#101;&#116;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +105,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-clear(1)</li>
   </ol>
 
diff --git a/man/git-commits-since.1 b/man/git-commits-since.1
index 755627881..fa98e0e0a 100644
--- a/man/git-commits-since.1
+++ b/man/git-commits-since.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-COMMITS\-SINCE" "1" "April 2015" "" ""
+.TH "GIT\-COMMITS\-SINCE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-commits\-since\fR \- Show commit logs since some date
diff --git a/man/git-commits-since.html b/man/git-commits-since.html
index d301b044e..260d0bfc5 100644
--- a/man/git-commits-since.html
+++ b/man/git-commits-since.html
@@ -113,7 +113,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x74;&#x6a;&#64;&#x76;&#105;&#x73;&#105;&#111;&#110;&#x2d;&#x6d;&#101;&#x64;&#x69;&#x61;&#46;&#99;&#97;" data-bare-link="true">&#x74;&#106;&#x40;&#x76;&#x69;&#x73;&#105;&#111;&#x6e;&#45;&#x6d;&#x65;&#x64;&#x69;&#97;&#x2e;&#99;&#97;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#116;&#x6a;&#x40;&#x76;&#105;&#x73;&#x69;&#x6f;&#110;&#45;&#109;&#x65;&#x64;&#105;&#x61;&#x2e;&#99;&#97;" data-bare-link="true">&#x74;&#106;&#64;&#x76;&#x69;&#115;&#105;&#111;&#x6e;&#x2d;&#x6d;&#x65;&#x64;&#x69;&#97;&#46;&#x63;&#97;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -126,7 +126,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-commits-since(1)</li>
   </ol>
 
diff --git a/man/git-contrib.1 b/man/git-contrib.1
index 20e7e32a2..53185907e 100644
--- a/man/git-contrib.1
+++ b/man/git-contrib.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-CONTRIB" "1" "August 2015" "" "Git Extras"
+.TH "GIT\-CONTRIB" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-contrib\fR \- Show user\'s contributions
diff --git a/man/git-contrib.html b/man/git-contrib.html
index cb806f60e..6ed9256bd 100644
--- a/man/git-contrib.html
+++ b/man/git-contrib.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-contrib(1)</li>
-    <li class='tc'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-contrib(1)</li>
   </ol>
 
@@ -114,7 +114,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#58;&#116;&#x6a;&#64;&#118;&#x69;&#115;&#x69;&#111;&#110;&#45;&#x6d;&#101;&#100;&#105;&#x61;&#46;&#99;&#97;" data-bare-link="true">&#x74;&#x6a;&#x40;&#x76;&#105;&#115;&#105;&#x6f;&#x6e;&#45;&#x6d;&#101;&#x64;&#x69;&#x61;&#x2e;&#99;&#97;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x74;&#106;&#64;&#x76;&#x69;&#x73;&#x69;&#111;&#x6e;&#45;&#x6d;&#x65;&#x64;&#105;&#x61;&#46;&#x63;&#x61;" data-bare-link="true">&#x74;&#106;&#x40;&#118;&#x69;&#x73;&#x69;&#x6f;&#110;&#45;&#x6d;&#101;&#100;&#x69;&#97;&#46;&#99;&#97;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -127,7 +127,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-contrib(1)</li>
   </ol>
 
diff --git a/man/git-count.1 b/man/git-count.1
index 59ca303d4..88b273bcb 100644
--- a/man/git-count.1
+++ b/man/git-count.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-COUNT" "1" "April 2015" "" ""
+.TH "GIT\-COUNT" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-count\fR \- Show commit count
diff --git a/man/git-count.html b/man/git-count.html
index 86cb605b0..ed205a69a 100644
--- a/man/git-count.html
+++ b/man/git-count.html
@@ -125,7 +125,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x74;&#x6a;&#64;&#x76;&#105;&#x73;&#105;&#111;&#110;&#x2d;&#x6d;&#101;&#x64;&#x69;&#x61;&#46;&#99;&#97;" data-bare-link="true">&#x74;&#106;&#x40;&#x76;&#x69;&#x73;&#105;&#111;&#x6e;&#45;&#x6d;&#x65;&#x64;&#x69;&#97;&#x2e;&#99;&#97;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x74;&#106;&#64;&#x76;&#x69;&#x73;&#x69;&#111;&#x6e;&#45;&#x6d;&#x65;&#x64;&#105;&#x61;&#46;&#x63;&#x61;" data-bare-link="true">&#x74;&#106;&#x40;&#118;&#x69;&#x73;&#x69;&#x6f;&#110;&#45;&#x6d;&#101;&#100;&#x69;&#97;&#46;&#99;&#97;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -138,7 +138,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-count(1)</li>
   </ol>
 
diff --git a/man/git-create-branch.1 b/man/git-create-branch.1
index 973d226fa..00d6903f3 100644
--- a/man/git-create-branch.1
+++ b/man/git-create-branch.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-CREATE\-BRANCH" "1" "April 2015" "" ""
+.TH "GIT\-CREATE\-BRANCH" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-create\-branch\fR \- Create branches
diff --git a/man/git-create-branch.html b/man/git-create-branch.html
index 90c4982e7..9b91c4d9b 100644
--- a/man/git-create-branch.html
+++ b/man/git-create-branch.html
@@ -95,7 +95,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jonhnny Weslley &lt;<a href="&#x6d;&#x61;&#105;&#108;&#x74;&#x6f;&#58;&#106;&#x77;&#64;&#106;&#x6f;&#x6e;&#104;&#x6e;&#x6e;&#121;&#119;&#101;&#x73;&#x6c;&#108;&#101;&#x79;&#46;&#x6e;&#101;&#116;" data-bare-link="true">&#x6a;&#x77;&#64;&#106;&#111;&#110;&#x68;&#x6e;&#x6e;&#x79;&#119;&#x65;&#x73;&#108;&#108;&#x65;&#121;&#x2e;&#110;&#101;&#x74;</a>&gt;</p>
+<p>Written by Jonhnny Weslley &lt;<a href="&#109;&#x61;&#105;&#108;&#x74;&#x6f;&#x3a;&#x6a;&#x77;&#64;&#x6a;&#x6f;&#x6e;&#104;&#110;&#x6e;&#x79;&#x77;&#x65;&#x73;&#108;&#108;&#x65;&#x79;&#46;&#x6e;&#101;&#116;" data-bare-link="true">&#106;&#119;&#64;&#106;&#x6f;&#110;&#104;&#110;&#x6e;&#121;&#x77;&#101;&#115;&#x6c;&#x6c;&#101;&#x79;&#x2e;&#x6e;&#101;&#x74;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +108,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-create-branch(1)</li>
   </ol>
 
diff --git a/man/git-delete-branch.1 b/man/git-delete-branch.1
index b9ac56d51..425caeb28 100644
--- a/man/git-delete-branch.1
+++ b/man/git-delete-branch.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-DELETE\-BRANCH" "1" "April 2015" "" ""
+.TH "GIT\-DELETE\-BRANCH" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-delete\-branch\fR \- Delete branches
diff --git a/man/git-delete-branch.html b/man/git-delete-branch.html
index aab2f8efd..c50a83aa4 100644
--- a/man/git-delete-branch.html
+++ b/man/git-delete-branch.html
@@ -98,7 +98,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x74;&#x6a;&#64;&#x76;&#105;&#x73;&#105;&#111;&#110;&#x2d;&#x6d;&#101;&#x64;&#x69;&#x61;&#46;&#99;&#97;" data-bare-link="true">&#x74;&#106;&#x40;&#x76;&#x69;&#x73;&#105;&#111;&#x6e;&#45;&#x6d;&#x65;&#x64;&#x69;&#97;&#x2e;&#99;&#97;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#x74;&#106;&#64;&#x76;&#x69;&#x73;&#x69;&#111;&#x6e;&#45;&#x6d;&#x65;&#x64;&#105;&#x61;&#46;&#x63;&#x61;" data-bare-link="true">&#x74;&#106;&#x40;&#118;&#x69;&#x73;&#x69;&#x6f;&#110;&#45;&#x6d;&#101;&#100;&#x69;&#97;&#46;&#99;&#97;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -111,7 +111,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-delete-branch(1)</li>
   </ol>
 
diff --git a/man/git-delete-merged-branches.1 b/man/git-delete-merged-branches.1
index a68363492..694ffbbda 100644
--- a/man/git-delete-merged-branches.1
+++ b/man/git-delete-merged-branches.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-DELETE\-MERGED\-BRANCHES" "1" "April 2015" "" ""
+.TH "GIT\-DELETE\-MERGED\-BRANCHES" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-delete\-merged\-branches\fR \- Delete merged branches
diff --git a/man/git-delete-merged-branches.html b/man/git-delete-merged-branches.html
index d3eed0750..a3a10c3ef 100644
--- a/man/git-delete-merged-branches.html
+++ b/man/git-delete-merged-branches.html
@@ -89,7 +89,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jesús Espino &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x6a;&#101;&#115;&#112;&#x69;&#110;&#111;&#x67;&#x40;&#103;&#x6d;&#x61;&#x69;&#108;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6a;&#x65;&#115;&#112;&#x69;&#x6e;&#x6f;&#x67;&#64;&#x67;&#109;&#x61;&#105;&#x6c;&#x2e;&#x63;&#111;&#109;</a>&gt;</p>
+<p>Written by Jesús Espino &lt;<a href="&#x6d;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#x65;&#x73;&#x70;&#105;&#110;&#111;&#x67;&#64;&#x67;&#x6d;&#x61;&#x69;&#108;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x6a;&#x65;&#115;&#112;&#105;&#110;&#x6f;&#x67;&#64;&#x67;&#x6d;&#97;&#x69;&#x6c;&#x2e;&#x63;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -102,7 +102,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-delete-merged-branches(1)</li>
   </ol>
 
diff --git a/man/git-delete-submodule.1 b/man/git-delete-submodule.1
index a81186585..5cca72c80 100644
--- a/man/git-delete-submodule.1
+++ b/man/git-delete-submodule.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-DELETE\-SUBMODULE" "1" "April 2015" "" ""
+.TH "GIT\-DELETE\-SUBMODULE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-delete\-submodule\fR \- Delete submodules
diff --git a/man/git-delete-submodule.html b/man/git-delete-submodule.html
index 0321e8ed8..ada61c7c8 100644
--- a/man/git-delete-submodule.html
+++ b/man/git-delete-submodule.html
@@ -93,7 +93,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jonhnny Weslley &lt;<a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#58;&#106;&#x77;&#x40;&#106;&#x6f;&#x6e;&#x68;&#110;&#x6e;&#x79;&#x77;&#x65;&#x73;&#x6c;&#108;&#101;&#x79;&#x2e;&#x6e;&#x65;&#116;" data-bare-link="true">&#x6a;&#119;&#x40;&#106;&#x6f;&#x6e;&#x68;&#110;&#110;&#x79;&#119;&#101;&#115;&#108;&#x6c;&#101;&#x79;&#x2e;&#x6e;&#x65;&#116;</a>&gt;</p>
+<p>Written by Jonhnny Weslley &lt;<a href="&#109;&#97;&#x69;&#x6c;&#x74;&#111;&#58;&#106;&#x77;&#64;&#x6a;&#x6f;&#x6e;&#x68;&#110;&#x6e;&#x79;&#119;&#101;&#x73;&#x6c;&#108;&#101;&#121;&#46;&#x6e;&#x65;&#116;" data-bare-link="true">&#x6a;&#x77;&#64;&#x6a;&#x6f;&#x6e;&#x68;&#110;&#110;&#x79;&#119;&#x65;&#x73;&#108;&#108;&#101;&#x79;&#x2e;&#x6e;&#101;&#x74;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -106,7 +106,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-delete-submodule(1)</li>
   </ol>
 
diff --git a/man/git-delete-tag.1 b/man/git-delete-tag.1
index e4d9b8b4a..6aca8f87f 100644
--- a/man/git-delete-tag.1
+++ b/man/git-delete-tag.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-DELETE\-TAG" "1" "April 2015" "" ""
+.TH "GIT\-DELETE\-TAG" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-delete\-tag\fR \- Delete tags
diff --git a/man/git-delete-tag.html b/man/git-delete-tag.html
index f4e5621c4..67421c2e4 100644
--- a/man/git-delete-tag.html
+++ b/man/git-delete-tag.html
@@ -97,7 +97,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x74;&#106;&#64;&#118;&#x69;&#115;&#105;&#x6f;&#x6e;&#45;&#x6d;&#x65;&#x64;&#105;&#x61;&#x2e;&#x63;&#x61;" data-bare-link="true">&#x74;&#x6a;&#64;&#118;&#x69;&#x73;&#x69;&#x6f;&#110;&#x2d;&#109;&#x65;&#100;&#x69;&#x61;&#x2e;&#99;&#97;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#97;&#105;&#108;&#116;&#111;&#58;&#116;&#x6a;&#x40;&#x76;&#105;&#115;&#105;&#x6f;&#110;&#x2d;&#x6d;&#x65;&#x64;&#105;&#x61;&#x2e;&#99;&#97;" data-bare-link="true">&#x74;&#x6a;&#64;&#118;&#105;&#115;&#x69;&#x6f;&#110;&#x2d;&#x6d;&#101;&#x64;&#x69;&#x61;&#x2e;&#99;&#97;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -110,7 +110,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-delete-tag(1)</li>
   </ol>
 
diff --git a/man/git-delta.1 b/man/git-delta.1
index 74f59b940..6a0f7713f 100644
--- a/man/git-delta.1
+++ b/man/git-delta.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-DELTA" "1" "April 2015" "" ""
+.TH "GIT\-DELTA" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-delta\fR \- Lists changed files
diff --git a/man/git-delta.html b/man/git-delta.html
index 42e735cd8..274c53efb 100644
--- a/man/git-delta.html
+++ b/man/git-delta.html
@@ -95,7 +95,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Ivan Malopinsky &lt;<a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#104;&#101;&#108;&#x6c;&#x6f;&#x40;&#x69;&#109;&#x73;&#107;&#121;&#x2e;&#99;&#x6f;" data-bare-link="true">&#x68;&#101;&#108;&#108;&#x6f;&#64;&#105;&#109;&#115;&#107;&#x79;&#46;&#x63;&#111;</a>&gt;</p>
+<p>Written by Ivan Malopinsky &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#104;&#x65;&#x6c;&#x6c;&#x6f;&#64;&#x69;&#x6d;&#x73;&#x6b;&#x79;&#46;&#99;&#x6f;" data-bare-link="true">&#x68;&#x65;&#x6c;&#x6c;&#x6f;&#64;&#x69;&#x6d;&#115;&#x6b;&#x79;&#x2e;&#99;&#111;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +108,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-delta(1)</li>
   </ol>
 
diff --git a/man/git-effort.1 b/man/git-effort.1
index a30097477..f1055ce5c 100644
--- a/man/git-effort.1
+++ b/man/git-effort.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-EFFORT" "1" "September 2015" "" "Git Extras"
+.TH "GIT\-EFFORT" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-effort\fR \- Show effort statistics on file(s)
diff --git a/man/git-effort.html b/man/git-effort.html
index 5a9408f1b..78053d6a0 100644
--- a/man/git-effort.html
+++ b/man/git-effort.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-effort(1)</li>
-    <li class='tc'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-effort(1)</li>
   </ol>
 
@@ -161,7 +161,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Leila Muhtasib &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#109;&#117;&#x68;&#116;&#x61;&#x73;&#105;&#98;&#64;&#x67;&#109;&#x61;&#x69;&#x6c;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#109;&#x75;&#104;&#116;&#x61;&#x73;&#x69;&#x62;&#64;&#x67;&#109;&#97;&#105;&#108;&#46;&#x63;&#111;&#109;</a>&gt;</p>
+<p>Written by Leila Muhtasib &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#109;&#x75;&#x68;&#x74;&#x61;&#115;&#x69;&#x62;&#x40;&#x67;&#x6d;&#97;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x6d;&#117;&#x68;&#x74;&#97;&#x73;&#x69;&#x62;&#64;&#103;&#109;&#x61;&#105;&#108;&#46;&#x63;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -174,7 +174,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>September 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-effort(1)</li>
   </ol>
 
diff --git a/man/git-extras.1 b/man/git-extras.1
index 563207390..6a7b62486 100644
--- a/man/git-extras.1
+++ b/man/git-extras.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-EXTRAS" "1" "June 2015" "" ""
+.TH "GIT\-EXTRAS" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-extras\fR \- Awesome GIT utilities
@@ -51,6 +51,9 @@ Self update\.
 \fBgit\-chore(1)\fR Create chore branch
 .
 .IP "\(bu" 4
+\fBgit\-clear(1)\fR Rigorously clean up a repository
+.
+.IP "\(bu" 4
 \fBgit\-commits\-since(1)\fR Show commit logs since some date
 .
 .IP "\(bu" 4
@@ -81,7 +84,7 @@ Self update\.
 \fBgit\-effort(1)\fR Show effort statistics on file(s)
 .
 .IP "\(bu" 4
-\fBgit\-feature(1)\fR Create feature branch
+\fBgit\-feature(1)\fR Create/Merge feature branch
 .
 .IP "\(bu" 4
 \fBgit\-fork(1)\fR Fork a repo on github
@@ -99,6 +102,9 @@ Self update\.
 \fBgit\-guilt(1)\fR calculate change between two revisions
 .
 .IP "\(bu" 4
+\fBgit\-ignore\-io(1)\fR Get sample gitignore file
+.
+.IP "\(bu" 4
 \fBgit\-ignore(1)\fR Add \.gitignore patterns
 .
 .IP "\(bu" 4
@@ -129,6 +135,9 @@ Self update\.
 \fBgit\-pr(1)\fR Checks out a pull request locally
 .
 .IP "\(bu" 4
+\fBgit\-psykorebase(1)\fR Rebase a branch with a merge commit
+.
+.IP "\(bu" 4
 \fBgit\-rebase\-patch(1)\fR Rebases a patch
 .
 .IP "\(bu" 4
@@ -153,6 +162,9 @@ Self update\.
 \fBgit\-scp(1)\fR Copy files to SSH compatible \fBgit\-remote\fR
 .
 .IP "\(bu" 4
+\fBgit\-sed(1)\fR replace patterns in git\-controlled files
+.
+.IP "\(bu" 4
 \fBgit\-setup(1)\fR Set up a git repository
 .
 .IP "\(bu" 4
diff --git a/man/git-extras.html b/man/git-extras.html
index 8e02ee786..80508640d 100644
--- a/man/git-extras.html
+++ b/man/git-extras.html
@@ -101,6 +101,7 @@ <h2 id="COMMANDS">COMMANDS</h2>
 <li> <strong><a class="man-ref" href="git-bug.html">git-bug<span class="s">(1)</span></a></strong> Create bug branch</li>
 <li> <strong><a class="man-ref" href="git-changelog.html">git-changelog<span class="s">(1)</span></a></strong> Generate a changelog report</li>
 <li> <strong><a class="man-ref" href="git-chore.html">git-chore<span class="s">(1)</span></a></strong> Create chore branch</li>
+<li> <strong><a class="man-ref" href="git-clear.html">git-clear<span class="s">(1)</span></a></strong> Rigorously clean up a repository</li>
 <li> <strong><a class="man-ref" href="git-commits-since.html">git-commits-since<span class="s">(1)</span></a></strong> Show commit logs since some date</li>
 <li> <strong><a class="man-ref" href="git-contrib.html">git-contrib<span class="s">(1)</span></a></strong> Show user's contributions</li>
 <li> <strong><a class="man-ref" href="git-count.html">git-count<span class="s">(1)</span></a></strong> Show commit count</li>
@@ -111,12 +112,13 @@ <h2 id="COMMANDS">COMMANDS</h2>
 <li> <strong><a class="man-ref" href="git-delete-tag.html">git-delete-tag<span class="s">(1)</span></a></strong> Delete tags</li>
 <li> <strong><a class="man-ref" href="git-delta.html">git-delta<span class="s">(1)</span></a></strong> Lists changed files</li>
 <li> <strong><a class="man-ref" href="git-effort.html">git-effort<span class="s">(1)</span></a></strong> Show effort statistics on file(s)</li>
-<li> <strong><a class="man-ref" href="git-feature.html">git-feature<span class="s">(1)</span></a></strong> Create feature branch</li>
+<li> <strong><a class="man-ref" href="git-feature.html">git-feature<span class="s">(1)</span></a></strong> Create/Merge feature branch</li>
 <li> <strong><a class="man-ref" href="git-fork.html">git-fork<span class="s">(1)</span></a></strong> Fork a repo on github</li>
 <li> <strong><a class="man-ref" href="git-fresh-branch.html">git-fresh-branch<span class="s">(1)</span></a></strong> Create fresh branches</li>
 <li> <strong><a class="man-ref" href="git-gh-pages.html">git-gh-pages<span class="s">(1)</span></a></strong> Create the GitHub Pages branch</li>
 <li> <strong><a class="man-ref" href="git-graft.html">git-graft<span class="s">(1)</span></a></strong> Merge and destroy a given branch</li>
 <li> <strong><a class="man-ref" href="git-guilt.html">git-guilt<span class="s">(1)</span></a></strong> calculate change between two revisions</li>
+<li> <strong><a class="man-ref" href="git-ignore-io.html">git-ignore-io<span class="s">(1)</span></a></strong> Get sample gitignore file</li>
 <li> <strong><a class="man-ref" href="git-ignore.html">git-ignore<span class="s">(1)</span></a></strong> Add .gitignore patterns</li>
 <li> <strong><a class="man-ref" href="git-info.html">git-info<span class="s">(1)</span></a></strong> Returns information on current repository</li>
 <li> <strong><a class="man-ref" href="git-line-summary.html">git-line-summary<span class="s">(1)</span></a></strong> Show repository summary by line</li>
@@ -127,6 +129,7 @@ <h2 id="COMMANDS">COMMANDS</h2>
 <li> <strong><a class="man-ref" href="git-merge-repo.html">git-merge-repo<span class="s">(1)</span></a></strong> Merge two repo histories</li>
 <li> <strong><a class="man-ref" href="git-missing.html">git-missing<span class="s">(1)</span></a></strong> Show commits missing from another branch</li>
 <li> <strong><a class="man-ref" href="git-pr.html">git-pr<span class="s">(1)</span></a></strong> Checks out a pull request locally</li>
+<li> <strong><a class="man-ref" href="git-psykorebase.html">git-psykorebase<span class="s">(1)</span></a></strong> Rebase a branch with a merge commit</li>
 <li> <strong><a class="man-ref" href="git-rebase-patch.html">git-rebase-patch<span class="s">(1)</span></a></strong> Rebases a patch</li>
 <li> <strong><a class="man-ref" href="git-refactor.html">git-refactor<span class="s">(1)</span></a></strong> Create refactor branch</li>
 <li> <strong><a class="man-ref" href="git-release.html">git-release<span class="s">(1)</span></a></strong> Commit, tag and push changes to the repository</li>
@@ -135,6 +138,7 @@ <h2 id="COMMANDS">COMMANDS</h2>
 <li> <strong><a class="man-ref" href="git-reset-file.html">git-reset-file<span class="s">(1)</span></a></strong> Reset one file</li>
 <li> <strong><a class="man-ref" href="git-root.html">git-root<span class="s">(1)</span></a></strong> show path of root</li>
 <li> <strong><a class="man-ref" href="git-scp.html">git-scp<span class="s">(1)</span></a></strong> Copy files to SSH compatible <code>git-remote</code></li>
+<li> <strong><a class="man-ref" href="git-sed.html">git-sed<span class="s">(1)</span></a></strong> replace patterns in git-controlled files</li>
 <li> <strong><a class="man-ref" href="git-setup.html">git-setup<span class="s">(1)</span></a></strong> Set up a git repository</li>
 <li> <strong><a class="man-ref" href="git-show-merged-branches.html">git-show-merged-branches<span class="s">(1)</span></a></strong> Show merged branches</li>
 <li> <strong><a class="man-ref" href="git-show-tree.html">git-show-tree<span class="s">(1)</span></a></strong> show branch tree of commit history</li>
@@ -149,7 +153,7 @@ <h2 id="COMMANDS">COMMANDS</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#x61;&#105;&#108;&#x74;&#111;&#58;&#x74;&#x6a;&#x40;&#118;&#105;&#115;&#105;&#111;&#x6e;&#45;&#x6d;&#x65;&#x64;&#x69;&#97;&#x2e;&#99;&#97;" data-bare-link="true">&#x74;&#106;&#64;&#118;&#x69;&#115;&#x69;&#x6f;&#110;&#x2d;&#109;&#101;&#100;&#x69;&#x61;&#x2e;&#x63;&#x61;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#x74;&#x6a;&#x40;&#x76;&#x69;&#x73;&#x69;&#111;&#x6e;&#45;&#x6d;&#101;&#100;&#x69;&#x61;&#46;&#x63;&#97;" data-bare-link="true">&#116;&#x6a;&#64;&#x76;&#105;&#x73;&#x69;&#111;&#110;&#45;&#x6d;&#101;&#100;&#x69;&#x61;&#x2e;&#99;&#97;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -162,7 +166,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>June 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-extras(1)</li>
   </ol>
 
diff --git a/man/git-extras.md b/man/git-extras.md
index 6c44b9dbc..1f21d63ad 100644
--- a/man/git-extras.md
+++ b/man/git-extras.md
@@ -28,6 +28,7 @@ git-extras(1) -- Awesome GIT utilities
    - **git-bug(1)** Create bug branch
    - **git-changelog(1)** Generate a changelog report
    - **git-chore(1)** Create chore branch
+   - **git-clear(1)** Rigorously clean up a repository
    - **git-commits-since(1)** Show commit logs since some date
    - **git-contrib(1)** Show user's contributions
    - **git-count(1)** Show commit count
@@ -38,12 +39,13 @@ git-extras(1) -- Awesome GIT utilities
    - **git-delete-tag(1)** Delete tags
    - **git-delta(1)** Lists changed files
    - **git-effort(1)** Show effort statistics on file(s)
-   - **git-feature(1)** Create feature branch
+   - **git-feature(1)** Create/Merge feature branch
    - **git-fork(1)** Fork a repo on github
    - **git-fresh-branch(1)** Create fresh branches
    - **git-gh-pages(1)** Create the GitHub Pages branch
    - **git-graft(1)** Merge and destroy a given branch
    - **git-guilt(1)** calculate change between two revisions
+   - **git-ignore-io(1)** Get sample gitignore file
    - **git-ignore(1)** Add .gitignore patterns
    - **git-info(1)** Returns information on current repository
    - **git-line-summary(1)** Show repository summary by line
@@ -54,6 +56,7 @@ git-extras(1) -- Awesome GIT utilities
    - **git-merge-repo(1)** Merge two repo histories
    - **git-missing(1)** Show commits missing from another branch
    - **git-pr(1)** Checks out a pull request locally
+   - **git-psykorebase(1)** Rebase a branch with a merge commit
    - **git-rebase-patch(1)** Rebases a patch
    - **git-refactor(1)** Create refactor branch
    - **git-release(1)** Commit, tag and push changes to the repository
@@ -62,6 +65,7 @@ git-extras(1) -- Awesome GIT utilities
    - **git-reset-file(1)** Reset one file
    - **git-root(1)** show path of root
    - **git-scp(1)** Copy files to SSH compatible `git-remote`
+   - **git-sed(1)** replace patterns in git-controlled files
    - **git-setup(1)** Set up a git repository
    - **git-show-merged-branches(1)** Show merged branches
    - **git-show-tree(1)** show branch tree of commit history
diff --git a/man/git-feature.1 b/man/git-feature.1
index 5a21b9d2f..1f3291f5d 100644
--- a/man/git-feature.1
+++ b/man/git-feature.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-FEATURE" "1" "September 2015" "" ""
+.TH "GIT\-FEATURE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-feature\fR \- Create/Merge feature branch
diff --git a/man/git-feature.1.html b/man/git-feature.1.html
deleted file mode 100644
index 253d12c56..000000000
--- a/man/git-feature.1.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
-  <title>git-feature(1) - Create/Merge feature branch</title>
-  <style type='text/css' media='all'>
-  /* style: man */
-  body#manpage {margin:0}
-  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
-  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
-  .mp h2 {margin:10px 0 0 0}
-  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
-  .mp h3 {margin:0 0 0 4ex}
-  .mp dt {margin:0;clear:left}
-  .mp dt.flush {float:left;width:8ex}
-  .mp dd {margin:0 0 0 9ex}
-  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
-  .mp pre {margin-bottom:20px}
-  .mp pre+h2,.mp pre+h3 {margin-top:22px}
-  .mp h2+pre,.mp h3+pre {margin-top:5px}
-  .mp img {display:block;margin:auto}
-  .mp h1.man-title {display:none}
-  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
-  .mp h2 {font-size:16px;line-height:1.25}
-  .mp h1 {font-size:20px;line-height:2}
-  .mp {text-align:justify;background:#fff}
-  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
-  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
-  .mp u {text-decoration:underline}
-  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
-  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
-  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
-  .mp b.man-ref {font-weight:normal;color:#434241}
-  .mp pre {padding:0 4ex}
-  .mp pre code {font-weight:normal;color:#434241}
-  .mp h2+pre,h3+pre {padding-left:0}
-  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
-  ol.man-decor {width:100%}
-  ol.man-decor li.tl {text-align:left}
-  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
-  ol.man-decor li.tr {text-align:right;float:right}
-  </style>
-</head>
-<!--
-  The following styles are deprecated and will be removed at some point:
-  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
-
-  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
-  .man-navigation should be used instead.
--->
-<body id='manpage'>
-  <div class='mp' id='man'>
-
-  <div class='man-navigation' style='display:none'>
-    <a href="#NAME">NAME</a>
-    <a href="#SYNOPSIS">SYNOPSIS</a>
-    <a href="#DESCRIPTION">DESCRIPTION</a>
-    <a href="#OPTIONS">OPTIONS</a>
-    <a href="#EXAMPLES">EXAMPLES</a>
-    <a href="#AUTHOR">AUTHOR</a>
-    <a href="#REPORTING-BUGS">REPORTING BUGS</a>
-    <a href="#SEE-ALSO">SEE ALSO</a>
-  </div>
-
-  <ol class='man-decor man-head man head'>
-    <li class='tl'>git-feature(1)</li>
-    <li class='tc'></li>
-    <li class='tr'>git-feature(1)</li>
-  </ol>
-
-  <h2 id="NAME">NAME</h2>
-<p class="man-name">
-  <code>git-feature</code> - <span class="man-whatis">Create/Merge feature branch</span>
-</p>
-
-<h2 id="SYNOPSIS">SYNOPSIS</h2>
-
-<p><code>git-feature</code> [-a|--alias branch_prefix] [finish] &lt;name&gt;</p>
-
-<h2 id="DESCRIPTION">DESCRIPTION</h2>
-
-<p>  Create/Merge the given feature branch</p>
-
-<h2 id="OPTIONS">OPTIONS</h2>
-
-<p>  &lt;-a|--alias branch_prefix&gt;</p>
-
-<p>  use <code>branch_prefix</code> instead of <code>feature</code></p>
-
-<p>  &lt;finish&gt;</p>
-
-<p>  Merge and delete the feature branch.</p>
-
-<p>  &lt;name&gt;</p>
-
-<p>  The name of the feature branch.</p>
-
-<h2 id="EXAMPLES">EXAMPLES</h2>
-
-<pre><code>$ git feature dependencies
-...
-$ (feature/dependencies) git commit -m "Some changes"
-...
-$ (feature/dependencies) git checkout master
-$ git feature finish dependencies
-
-$ git alias features "feature -a features"
-$ git features dependencies
-$ (features/dependencies) ...
-$ (features/dependencies) git checkout master
-$ git features finish dependencies
-</code></pre>
-
-<h2 id="AUTHOR">AUTHOR</h2>
-
-<p>Written by Jesús Espino &lt;<a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#106;&#x65;&#x73;&#112;&#105;&#110;&#x6f;&#103;&#64;&#103;&#x6d;&#x61;&#x69;&#x6c;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x6a;&#x65;&#x73;&#112;&#105;&#110;&#111;&#x67;&#x40;&#103;&#109;&#x61;&#105;&#108;&#46;&#99;&#111;&#109;</a>&gt;</p>
-
-<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
-
-<p>&lt;<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>&gt;</p>
-
-<h2 id="SEE-ALSO">SEE ALSO</h2>
-
-<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;</p>
-
-
-  <ol class='man-decor man-foot man foot'>
-    <li class='tl'></li>
-    <li class='tc'>September 2015</li>
-    <li class='tr'>git-feature(1)</li>
-  </ol>
-
-  </div>
-</body>
-</html>
diff --git a/man/git-feature.html b/man/git-feature.html
index 58a748a9c..0374e9e6e 100644
--- a/man/git-feature.html
+++ b/man/git-feature.html
@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
   <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
-  <title>git-feature(1) - Create feature branch</title>
+  <title>git-feature(1) - Create/Merge feature branch</title>
   <style type='text/css' media='all'>
   /* style: man */
   body#manpage {margin:0}
@@ -71,19 +71,23 @@
 
   <h2 id="NAME">NAME</h2>
 <p class="man-name">
-  <code>git-feature</code> - <span class="man-whatis">Create feature branch</span>
+  <code>git-feature</code> - <span class="man-whatis">Create/Merge feature branch</span>
 </p>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>git-feature</code> [finish] &lt;name&gt;</p>
+<p><code>git-feature</code> [-a|--alias branch_prefix] [finish] &lt;name&gt;</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>  Create the given feature branch</p>
+<p>  Create/Merge the given feature branch</p>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
+<p>  &lt;-a|--alias branch_prefix&gt;</p>
+
+<p>  use <code>branch_prefix</code> instead of <code>feature</code></p>
+
 <p>  &lt;finish&gt;</p>
 
 <p>  Merge and delete the feature branch.</p>
@@ -96,15 +100,21 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <pre><code>$ git feature dependencies
 ...
-$ git commit -m "Some changes"
+$ (feature/dependencies) git commit -m "Some changes"
 ...
-$ git checkout master
+$ (feature/dependencies) git checkout master
 $ git feature finish dependencies
+
+$ git alias features "feature -a features"
+$ git features dependencies
+$ (features/dependencies) ...
+$ (features/dependencies) git checkout master
+$ git features finish dependencies
 </code></pre>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jesús Espino &lt;<a href="&#x6d;&#97;&#105;&#108;&#116;&#111;&#x3a;&#106;&#101;&#115;&#x70;&#x69;&#110;&#x6f;&#x67;&#64;&#103;&#109;&#x61;&#x69;&#x6c;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#101;&#x73;&#112;&#105;&#x6e;&#x6f;&#x67;&#x40;&#103;&#x6d;&#97;&#x69;&#108;&#46;&#99;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Jesús Espino &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#x6a;&#x65;&#x73;&#x70;&#x69;&#x6e;&#x6f;&#103;&#x40;&#103;&#x6d;&#97;&#105;&#x6c;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#x65;&#115;&#x70;&#105;&#x6e;&#x6f;&#103;&#64;&#103;&#x6d;&#97;&#105;&#x6c;&#x2e;&#x63;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -117,7 +127,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-feature(1)</li>
   </ol>
 
diff --git a/man/git-fork.1 b/man/git-fork.1
index b2ae55dcd..ed46a505c 100644
--- a/man/git-fork.1
+++ b/man/git-fork.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-FORK" "1" "August 2015" "" "Git Extras"
+.TH "GIT\-FORK" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-fork\fR \- Fork a repo on github
diff --git a/man/git-fork.html b/man/git-fork.html
index 4b1f1d368..4d8624bf8 100644
--- a/man/git-fork.html
+++ b/man/git-fork.html
@@ -64,7 +64,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-fork(1)</li>
-    <li class='tc'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-fork(1)</li>
   </ol>
 
@@ -82,9 +82,9 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>  Fork the given github repo. Like clone but forks first.</p>
 
 <ol>
-<li> forks the repo on github</li>
-<li> clones the repo into the current dir</li>
-<li> adds the original repo as a remote called upstream</li>
+<li>forks the repo on github</li>
+<li>clones the repo into the current dir</li>
+<li>adds the original repo as a remote called upstream</li>
 </ol>
 
 
@@ -114,7 +114,7 @@ <h2 id="EXAMPLE">EXAMPLE</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Andrew Griffiths &lt;<a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#x6d;&#97;&#105;&#108;&#x40;&#x61;&#110;&#100;&#114;&#x65;&#119;&#103;&#x72;&#105;&#x66;&#x66;&#x69;&#116;&#x68;&#x73;&#x6f;&#x6e;&#108;&#x69;&#x6e;&#x65;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#109;&#x61;&#x69;&#x6c;&#x40;&#97;&#110;&#x64;&#114;&#101;&#119;&#103;&#x72;&#x69;&#102;&#102;&#105;&#116;&#104;&#x73;&#x6f;&#x6e;&#x6c;&#x69;&#x6e;&#101;&#46;&#x63;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Andrew Griffiths &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#x6d;&#x61;&#x69;&#x6c;&#x40;&#x61;&#x6e;&#100;&#x72;&#101;&#x77;&#103;&#114;&#x69;&#x66;&#102;&#x69;&#116;&#104;&#x73;&#111;&#x6e;&#108;&#x69;&#x6e;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#109;&#x61;&#x69;&#x6c;&#64;&#97;&#110;&#100;&#x72;&#x65;&#119;&#103;&#x72;&#105;&#x66;&#x66;&#105;&#x74;&#x68;&#x73;&#111;&#110;&#108;&#x69;&#x6e;&#101;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -127,7 +127,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-fork(1)</li>
   </ol>
 
diff --git a/man/git-fresh-branch.1 b/man/git-fresh-branch.1
index a34bbfa5e..1a94f99a0 100644
--- a/man/git-fresh-branch.1
+++ b/man/git-fresh-branch.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-FRESH\-BRANCH" "1" "April 2015" "" ""
+.TH "GIT\-FRESH\-BRANCH" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-fresh\-branch\fR \- Create fresh branches
diff --git a/man/git-fresh-branch.html b/man/git-fresh-branch.html
index f6d5deebf..a61c6415a 100644
--- a/man/git-fresh-branch.html
+++ b/man/git-fresh-branch.html
@@ -95,7 +95,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Kenneth Reitz &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#x6d;&#101;&#64;&#x6b;&#101;&#x6e;&#110;&#x65;&#x74;&#104;&#114;&#101;&#x69;&#116;&#122;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#109;&#x65;&#x40;&#107;&#x65;&#110;&#x6e;&#101;&#x74;&#x68;&#x72;&#101;&#105;&#x74;&#x7a;&#46;&#99;&#111;&#109;</a>&gt;</p>
+<p>Written by Kenneth Reitz &lt;<a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#109;&#x65;&#64;&#107;&#101;&#x6e;&#x6e;&#101;&#x74;&#x68;&#x72;&#x65;&#x69;&#x74;&#x7a;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#109;&#x65;&#64;&#x6b;&#x65;&#110;&#x6e;&#x65;&#x74;&#104;&#114;&#x65;&#x69;&#116;&#122;&#x2e;&#99;&#x6f;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +108,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-fresh-branch(1)</li>
   </ol>
 
diff --git a/man/git-gh-pages.1 b/man/git-gh-pages.1
index a6e8c5a9b..6be153ad7 100644
--- a/man/git-gh-pages.1
+++ b/man/git-gh-pages.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-GH\-PAGES" "1" "April 2015" "" ""
+.TH "GIT\-GH\-PAGES" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-gh\-pages\fR \- Create the GitHub Pages branch
diff --git a/man/git-gh-pages.html b/man/git-gh-pages.html
index 232aeeed0..8f8749444 100644
--- a/man/git-gh-pages.html
+++ b/man/git-gh-pages.html
@@ -101,7 +101,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jesús Espino &lt;<a href="&#x6d;&#97;&#105;&#108;&#116;&#111;&#x3a;&#106;&#101;&#115;&#x70;&#x69;&#110;&#x6f;&#x67;&#64;&#103;&#109;&#x61;&#x69;&#x6c;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#101;&#x73;&#112;&#105;&#x6e;&#x6f;&#x67;&#x40;&#103;&#x6d;&#97;&#x69;&#108;&#46;&#99;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Jesús Espino &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#x6a;&#x65;&#115;&#x70;&#105;&#x6e;&#111;&#x67;&#x40;&#103;&#x6d;&#x61;&#x69;&#x6c;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x6a;&#101;&#x73;&#112;&#105;&#110;&#x6f;&#103;&#64;&#103;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -114,7 +114,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-gh-pages(1)</li>
   </ol>
 
diff --git a/man/git-graft.1 b/man/git-graft.1
index b2a93026f..bdea3619d 100644
--- a/man/git-graft.1
+++ b/man/git-graft.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-GRAFT" "1" "April 2015" "" ""
+.TH "GIT\-GRAFT" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-graft\fR \- Merge and destroy a given branch
diff --git a/man/git-graft.html b/man/git-graft.html
index e15565e00..5e343d7e8 100644
--- a/man/git-graft.html
+++ b/man/git-graft.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-graft(1)</li>
-    <li class='tc'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-graft(1)</li>
   </ol>
 
@@ -95,7 +95,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Kenneth Reitz &lt;<a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#109;&#101;&#64;&#107;&#x65;&#110;&#x6e;&#101;&#x74;&#104;&#114;&#x65;&#105;&#x74;&#x7a;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#109;&#x65;&#64;&#107;&#101;&#110;&#x6e;&#101;&#116;&#104;&#x72;&#101;&#105;&#x74;&#122;&#46;&#x63;&#111;&#x6d;</a>&gt;</p>
+<p>Written by Kenneth Reitz &lt;<a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#109;&#x65;&#64;&#107;&#101;&#x6e;&#x6e;&#101;&#x74;&#x68;&#x72;&#x65;&#x69;&#x74;&#x7a;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#109;&#x65;&#64;&#x6b;&#x65;&#110;&#x6e;&#x65;&#x74;&#104;&#114;&#x65;&#x69;&#116;&#122;&#x2e;&#99;&#x6f;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +108,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-graft(1)</li>
   </ol>
 
diff --git a/man/git-guilt.1 b/man/git-guilt.1
index 9b3b38dee..6df387020 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" "August 2015" "" "Git Extras"
+.TH "GIT\-GUILT" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-guilt\fR \- calculate change between two revisions
diff --git a/man/git-guilt.html b/man/git-guilt.html
index 83ceb2087..b71f59010 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'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-guilt(1)</li>
   </ol>
 
@@ -148,7 +148,7 @@ <h2 id="Examples">Examples</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<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>
+<p>Written by spacewander &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#x73;&#x70;&#97;&#x63;&#101;&#x77;&#97;&#x6e;&#x64;&#101;&#x72;&#x6c;&#x7a;&#x78;&#x40;&#103;&#109;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#x73;&#112;&#97;&#99;&#x65;&#x77;&#x61;&#110;&#100;&#x65;&#x72;&#x6c;&#122;&#120;&#64;&#103;&#109;&#x61;&#x69;&#x6c;&#46;&#99;&#x6f;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -161,7 +161,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-guilt(1)</li>
   </ol>
 
diff --git a/man/git-ignore-io.1 b/man/git-ignore-io.1
index d5b2f082b..4bdd82c8e 100644
--- a/man/git-ignore-io.1
+++ b/man/git-ignore-io.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-IGNORE\-IO" "1" "September 2015" "" ""
+.TH "GIT\-IGNORE\-IO" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-ignore\-io\fR \- Get sample gitignore file
diff --git a/man/git-ignore-io.1.html b/man/git-ignore-io.html
similarity index 93%
rename from man/git-ignore-io.1.html
rename to man/git-ignore-io.html
index bcc311d7c..fe2f549f0 100644
--- a/man/git-ignore-io.1.html
+++ b/man/git-ignore-io.html
@@ -152,7 +152,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Lee-W <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#99;&#108;&#x38;&#x37;&#x36;&#53;&#52;&#51;&#50;&#x31;&#64;&#x67;&#x6d;&#x61;&#105;&#108;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#x63;&#x6c;&#x38;&#x37;&#x36;&#x35;&#52;&#x33;&#50;&#x31;&#64;&#103;&#x6d;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#x6d;</a></p>
+<p>Written by Lee-W <a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#x63;&#x6c;&#56;&#x37;&#54;&#x35;&#52;&#x33;&#x32;&#49;&#x40;&#x67;&#x6d;&#x61;&#x69;&#108;&#46;&#x63;&#x6f;&#109;" data-bare-link="true">&#x63;&#108;&#56;&#55;&#x36;&#53;&#52;&#51;&#x32;&#x31;&#x40;&#103;&#109;&#x61;&#x69;&#x6c;&#46;&#99;&#111;&#109;</a></p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -165,7 +165,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>September 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-ignore-io(1)</li>
   </ol>
 
diff --git a/man/git-ignore.1 b/man/git-ignore.1
index 2c5d4290e..cc8cc984d 100644
--- a/man/git-ignore.1
+++ b/man/git-ignore.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-IGNORE" "1" "April 2015" "" ""
+.TH "GIT\-IGNORE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-ignore\fR \- Add \.gitignore patterns
diff --git a/man/git-ignore.html b/man/git-ignore.html
index 33738231c..74b0baaaa 100644
--- a/man/git-ignore.html
+++ b/man/git-ignore.html
@@ -188,8 +188,8 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#x3a;&#116;&#106;&#x40;&#118;&#x69;&#x73;&#105;&#111;&#x6e;&#x2d;&#x6d;&#x65;&#x64;&#105;&#97;&#46;&#99;&#x61;" data-bare-link="true">&#116;&#x6a;&#64;&#118;&#x69;&#115;&#x69;&#111;&#110;&#45;&#109;&#x65;&#x64;&#105;&#x61;&#x2e;&#x63;&#x61;</a>&gt; and Tema Bolshakov &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#116;&#x77;&#101;&#101;&#107;&#97;&#110;&#x65;&#64;&#103;&#109;&#97;&#105;&#x6c;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#116;&#119;&#x65;&#x65;&#x6b;&#97;&#x6e;&#101;&#64;&#103;&#109;&#x61;&#105;&#108;&#46;&#x63;&#111;&#109;</a>&gt;
-and Nick Lombard &lt;<a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#x67;&#x69;&#x74;&#x68;&#x75;&#x62;&#x40;&#x6a;&#105;&#103;&#115;&#x6f;&#x66;&#116;&#x2e;&#x63;&#111;&#46;&#122;&#x61;" data-bare-link="true">&#103;&#x69;&#x74;&#x68;&#117;&#98;&#x40;&#x6a;&#x69;&#x67;&#x73;&#111;&#x66;&#116;&#x2e;&#99;&#x6f;&#x2e;&#x7a;&#97;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#116;&#x6a;&#x40;&#x76;&#105;&#115;&#105;&#111;&#110;&#x2d;&#x6d;&#x65;&#100;&#x69;&#97;&#46;&#x63;&#x61;" data-bare-link="true">&#116;&#106;&#x40;&#118;&#x69;&#x73;&#x69;&#x6f;&#110;&#45;&#109;&#101;&#100;&#105;&#97;&#x2e;&#99;&#97;</a>&gt; and Tema Bolshakov &lt;<a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#58;&#116;&#x77;&#101;&#101;&#107;&#x61;&#x6e;&#101;&#x40;&#x67;&#x6d;&#97;&#x69;&#108;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x74;&#119;&#x65;&#x65;&#107;&#x61;&#110;&#x65;&#x40;&#103;&#x6d;&#97;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#x6d;</a>&gt;
+and Nick Lombard &lt;<a href="&#109;&#97;&#x69;&#x6c;&#116;&#111;&#58;&#x67;&#105;&#116;&#104;&#117;&#x62;&#x40;&#x6a;&#105;&#103;&#x73;&#x6f;&#x66;&#116;&#46;&#x63;&#x6f;&#x2e;&#x7a;&#97;" data-bare-link="true">&#103;&#105;&#116;&#104;&#x75;&#98;&#x40;&#106;&#105;&#103;&#115;&#x6f;&#102;&#x74;&#x2e;&#x63;&#111;&#x2e;&#122;&#x61;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -202,7 +202,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-ignore(1)</li>
   </ol>
 
diff --git a/man/git-info.1 b/man/git-info.1
index a0a0a229c..cdbd88461 100644
--- a/man/git-info.1
+++ b/man/git-info.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-INFO" "1" "April 2015" "" ""
+.TH "GIT\-INFO" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-info\fR \- Returns information on current repository
diff --git a/man/git-info.html b/man/git-info.html
index 23812f294..231d45e45 100644
--- a/man/git-info.html
+++ b/man/git-info.html
@@ -145,7 +145,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Leila Muhtasib &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#x3a;&#109;&#117;&#x68;&#116;&#x61;&#x73;&#105;&#98;&#x40;&#x67;&#x6d;&#x61;&#x69;&#108;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#109;&#x75;&#104;&#116;&#x61;&#115;&#x69;&#98;&#64;&#103;&#109;&#x61;&#x69;&#108;&#x2e;&#x63;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Leila Muhtasib &lt;<a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#109;&#x75;&#x68;&#x74;&#97;&#115;&#105;&#98;&#64;&#x67;&#x6d;&#x61;&#105;&#x6c;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#109;&#117;&#x68;&#116;&#x61;&#x73;&#x69;&#x62;&#64;&#103;&#109;&#97;&#105;&#108;&#46;&#x63;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -158,7 +158,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-info(1)</li>
   </ol>
 
diff --git a/man/git-line-summary.1 b/man/git-line-summary.1
index 0c94348db..665581584 100644
--- a/man/git-line-summary.1
+++ b/man/git-line-summary.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-LINE\-SUMMARY" "1" "May 2015" "" ""
+.TH "GIT\-LINE\-SUMMARY" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-line\-summary\fR \- Show repository summary by line
diff --git a/man/git-line-summary.html b/man/git-line-summary.html
index e3d30f945..e9db85668 100644
--- a/man/git-line-summary.html
+++ b/man/git-line-summary.html
@@ -178,7 +178,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Newell Zhu &lt;<a href="&#x6d;&#x61;&#105;&#108;&#x74;&#111;&#58;&#122;&#x6c;&#120;&#x2e;&#x73;&#x74;&#x61;&#114;&#x40;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x7a;&#x6c;&#120;&#46;&#115;&#116;&#97;&#x72;&#64;&#103;&#109;&#97;&#105;&#108;&#x2e;&#x63;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Newell Zhu &lt;<a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#122;&#x6c;&#x78;&#x2e;&#115;&#116;&#97;&#114;&#64;&#x67;&#x6d;&#x61;&#105;&#x6c;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#122;&#108;&#x78;&#46;&#x73;&#x74;&#x61;&#x72;&#64;&#103;&#109;&#97;&#105;&#108;&#46;&#x63;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -191,7 +191,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>June 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-line-summary(1)</li>
   </ol>
 
diff --git a/man/git-local-commits.1 b/man/git-local-commits.1
index e186ec038..f58785a1c 100644
--- a/man/git-local-commits.1
+++ b/man/git-local-commits.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-LOCAL\-COMMITS" "1" "April 2015" "" ""
+.TH "GIT\-LOCAL\-COMMITS" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-local\-commits\fR \- List local commits
diff --git a/man/git-local-commits.html b/man/git-local-commits.html
index 94abbaea1..ab34137de 100644
--- a/man/git-local-commits.html
+++ b/man/git-local-commits.html
@@ -95,7 +95,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Michael Komitee &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#109;&#x6b;&#111;&#109;&#105;&#116;&#101;&#x65;&#64;&#103;&#109;&#97;&#105;&#x6c;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#109;&#107;&#x6f;&#x6d;&#x69;&#116;&#x65;&#101;&#64;&#103;&#109;&#x61;&#105;&#108;&#46;&#x63;&#111;&#109;</a>&gt;</p>
+<p>Written by Michael Komitee &lt;<a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#58;&#109;&#x6b;&#111;&#109;&#105;&#x74;&#x65;&#101;&#x40;&#x67;&#x6d;&#97;&#x69;&#108;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6d;&#107;&#x6f;&#x6d;&#105;&#x74;&#101;&#x65;&#x40;&#103;&#x6d;&#97;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +108,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-local-commits(1)</li>
   </ol>
 
diff --git a/man/git-lock.1 b/man/git-lock.1
index 535fe162a..e4b5ba5b7 100644
--- a/man/git-lock.1
+++ b/man/git-lock.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-LOCK" "1" "April 2015" "" ""
+.TH "GIT\-LOCK" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-lock\fR \- Lock a file excluded from version control
diff --git a/man/git-lock.html b/man/git-lock.html
index f0e8c6a59..04472ec52 100644
--- a/man/git-lock.html
+++ b/man/git-lock.html
@@ -95,7 +95,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Julio Napuri &lt;<a href="&#x6d;&#x61;&#105;&#108;&#x74;&#x6f;&#58;&#x6a;&#x75;&#108;&#x69;&#111;&#110;&#99;&#64;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#106;&#117;&#x6c;&#105;&#x6f;&#110;&#x63;&#64;&#103;&#x6d;&#97;&#x69;&#x6c;&#46;&#99;&#111;&#109;</a>&gt;</p>
+<p>Written by Julio Napuri &lt;<a href="&#109;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#106;&#x75;&#108;&#105;&#111;&#110;&#99;&#64;&#x67;&#x6d;&#x61;&#x69;&#x6c;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#117;&#x6c;&#x69;&#x6f;&#110;&#x63;&#x40;&#x67;&#x6d;&#x61;&#105;&#108;&#46;&#99;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +108,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-lock(1)</li>
   </ol>
 
diff --git a/man/git-locked.1 b/man/git-locked.1
index c62ed99d4..36684c694 100644
--- a/man/git-locked.1
+++ b/man/git-locked.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-LOCKED" "1" "April 2015" "" ""
+.TH "GIT\-LOCKED" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-locked\fR \- ls files that have been locked
diff --git a/man/git-locked.html b/man/git-locked.html
index f49967b58..8957ed5fd 100644
--- a/man/git-locked.html
+++ b/man/git-locked.html
@@ -90,7 +90,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Kevin Woo &lt;<a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#x3a;&#107;&#101;&#118;&#105;&#110;&#x61;&#119;&#111;&#111;&#64;&#103;&#x6d;&#x61;&#105;&#x6c;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x6b;&#x65;&#118;&#x69;&#110;&#97;&#119;&#111;&#x6f;&#64;&#103;&#109;&#x61;&#105;&#108;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
+<p>Written by Kevin Woo &lt;<a href="&#x6d;&#x61;&#105;&#108;&#x74;&#111;&#58;&#107;&#101;&#118;&#105;&#x6e;&#x61;&#x77;&#x6f;&#x6f;&#x40;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#x6b;&#x65;&#x76;&#x69;&#x6e;&#97;&#119;&#111;&#111;&#64;&#103;&#x6d;&#97;&#x69;&#x6c;&#46;&#99;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -103,7 +103,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-locked(1)</li>
   </ol>
 
diff --git a/man/git-merge-into.1 b/man/git-merge-into.1
index 2ed9f1963..aada1656d 100644
--- a/man/git-merge-into.1
+++ b/man/git-merge-into.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-MERGE\-INTO" "1" "August 2015" "" "Git Extras"
+.TH "GIT\-MERGE\-INTO" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-merge\-into\fR \- Merge one branch into another
diff --git a/man/git-merge-into.html b/man/git-merge-into.html
index 077ad0e3b..c2fb41b54 100644
--- a/man/git-merge-into.html
+++ b/man/git-merge-into.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-merge-into(1)</li>
-    <li class='tc'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-merge-into(1)</li>
   </ol>
 
@@ -122,7 +122,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by spacewander &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#115;&#112;&#97;&#99;&#x65;&#x77;&#97;&#x6e;&#100;&#101;&#114;&#108;&#x7a;&#120;&#x40;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#x73;&#x70;&#x61;&#x63;&#101;&#119;&#x61;&#x6e;&#x64;&#x65;&#x72;&#108;&#x7a;&#120;&#64;&#x67;&#109;&#97;&#x69;&#x6c;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
+<p>Written by spacewander &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#115;&#112;&#97;&#x63;&#x65;&#x77;&#97;&#110;&#100;&#101;&#x72;&#108;&#122;&#120;&#64;&#103;&#109;&#97;&#105;&#x6c;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#115;&#x70;&#x61;&#99;&#101;&#119;&#97;&#110;&#x64;&#101;&#114;&#108;&#x7a;&#120;&#x40;&#x67;&#109;&#97;&#x69;&#108;&#46;&#99;&#111;&#109;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -135,7 +135,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-merge-into(1)</li>
   </ol>
 
diff --git a/man/git-merge-repo.1 b/man/git-merge-repo.1
index bc3e7c54b..4fa90f28f 100644
--- a/man/git-merge-repo.1
+++ b/man/git-merge-repo.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-MERGE\-REPO" "1" "April 2015" "" ""
+.TH "GIT\-MERGE\-REPO" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-merge\-repo\fR \- Merge two repo histories
diff --git a/man/git-merge-repo.html b/man/git-merge-repo.html
index 2faa8faa7..a91fdb878 100644
--- a/man/git-merge-repo.html
+++ b/man/git-merge-repo.html
@@ -97,7 +97,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Ivan Malopinsky &lt;<a href="&#109;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#104;&#x65;&#x6c;&#x6c;&#x6f;&#x40;&#105;&#109;&#x73;&#x6b;&#x79;&#x2e;&#x63;&#111;" data-bare-link="true">&#104;&#x65;&#108;&#108;&#x6f;&#x40;&#105;&#x6d;&#x73;&#107;&#x79;&#46;&#99;&#x6f;</a>&gt;</p>
+<p>Written by Ivan Malopinsky &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#104;&#101;&#108;&#x6c;&#x6f;&#x40;&#105;&#109;&#115;&#107;&#x79;&#46;&#99;&#111;" data-bare-link="true">&#104;&#101;&#108;&#108;&#111;&#x40;&#105;&#109;&#x73;&#107;&#121;&#x2e;&#x63;&#111;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -110,7 +110,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-merge-repo(1)</li>
   </ol>
 
diff --git a/man/git-missing.1 b/man/git-missing.1
index 1c112cdf1..71b034171 100644
--- a/man/git-missing.1
+++ b/man/git-missing.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-MISSING" "1" "April 2015" "" ""
+.TH "GIT\-MISSING" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-missing\fR \- Show commits missing from another branch
diff --git a/man/git-missing.html b/man/git-missing.html
index ff20c836e..63a0095ae 100644
--- a/man/git-missing.html
+++ b/man/git-missing.html
@@ -115,7 +115,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Nate Jones &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x6e;&#97;&#x74;&#101;&#64;&#101;&#x6e;&#x64;&#x6f;&#x74;&#46;&#x6f;&#114;&#x67;" data-bare-link="true">&#x6e;&#97;&#x74;&#101;&#64;&#x65;&#110;&#x64;&#x6f;&#x74;&#46;&#111;&#114;&#x67;</a>&gt;</p>
+<p>Written by Nate Jones &lt;<a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#58;&#x6e;&#x61;&#116;&#101;&#x40;&#101;&#110;&#x64;&#111;&#x74;&#46;&#111;&#x72;&#x67;" data-bare-link="true">&#x6e;&#97;&#116;&#x65;&#64;&#101;&#x6e;&#100;&#111;&#116;&#x2e;&#x6f;&#x72;&#x67;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -128,7 +128,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-missing(1)</li>
   </ol>
 
diff --git a/man/git-pr.1 b/man/git-pr.1
index 17d4cff7d..0c62df08b 100644
--- a/man/git-pr.1
+++ b/man/git-pr.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-PR" "1" "April 2015" "" ""
+.TH "GIT\-PR" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-pr\fR \- Checks out a pull request locally
diff --git a/man/git-pr.html b/man/git-pr.html
index f1a3a5019..40406135c 100644
--- a/man/git-pr.html
+++ b/man/git-pr.html
@@ -134,7 +134,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-pr(1)</li>
   </ol>
 
diff --git a/man/git-psykorebase.1 b/man/git-psykorebase.1
index 2da16e5e3..71769d921 100644
--- a/man/git-psykorebase.1
+++ b/man/git-psykorebase.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-PSYKOREBASE" "1" "August 2015" "" ""
+.TH "GIT\-PSYKOREBASE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-psykorebase\fR \- Rebase a branch with a merge commit
diff --git a/man/git-psykorebase.html b/man/git-psykorebase.html
index a17acb0ac..6e1e89e29 100644
--- a/man/git-psykorebase.html
+++ b/man/git-psykorebase.html
@@ -110,9 +110,9 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by R&eacute;my Hubscher &lt;<a href="&#x6d;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#114;&#104;&#117;&#x62;&#x73;&#99;&#104;&#x65;&#114;&#x40;&#109;&#111;&#122;&#x69;&#108;&#x6c;&#x61;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#x72;&#104;&#117;&#98;&#x73;&#x63;&#x68;&#x65;&#114;&#64;&#x6d;&#x6f;&#122;&#x69;&#108;&#108;&#x61;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
+<p>Written by Rémy Hubscher &lt;<a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#58;&#x72;&#x68;&#117;&#98;&#x73;&#99;&#104;&#x65;&#114;&#x40;&#109;&#111;&#x7a;&#x69;&#x6c;&#108;&#97;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#114;&#104;&#117;&#x62;&#x73;&#x63;&#x68;&#x65;&#x72;&#x40;&#109;&#111;&#x7a;&#105;&#108;&#x6c;&#x61;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
 
-<p>Based on Beno&icirc;t Bryon &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#x3a;&#98;&#x65;&#x6e;&#x6f;&#x69;&#116;&#x40;&#109;&#x61;&#114;&#x6d;&#x65;&#108;&#x75;&#110;&#101;&#46;&#110;&#101;&#x74;" data-bare-link="true">&#x62;&#101;&#110;&#x6f;&#105;&#x74;&#64;&#109;&#x61;&#114;&#x6d;&#x65;&#x6c;&#x75;&#110;&#x65;&#x2e;&#x6e;&#x65;&#116;</a>&gt; implementation in
+<p>Based on Benoît Bryon &lt;<a href="&#109;&#x61;&#105;&#x6c;&#x74;&#x6f;&#58;&#98;&#x65;&#110;&#111;&#x69;&#116;&#64;&#109;&#x61;&#x72;&#109;&#x65;&#x6c;&#117;&#x6e;&#101;&#x2e;&#x6e;&#101;&#116;" data-bare-link="true">&#98;&#101;&#110;&#x6f;&#105;&#x74;&#64;&#x6d;&#x61;&#x72;&#x6d;&#x65;&#108;&#x75;&#x6e;&#x65;&#x2e;&#x6e;&#x65;&#x74;</a>&gt; implementation in
 Python.</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
@@ -128,7 +128,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-psykorebase(1)</li>
   </ol>
 
diff --git a/man/git-rebase-patch.1 b/man/git-rebase-patch.1
index e96364743..101b2028d 100644
--- a/man/git-rebase-patch.1
+++ b/man/git-rebase-patch.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-REBASE\-PATCH" "1" "April 2015" "" ""
+.TH "GIT\-REBASE\-PATCH" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-rebase\-patch\fR \- Rebases a patch
diff --git a/man/git-rebase-patch.html b/man/git-rebase-patch.html
index 0072c0862..daf99cd45 100644
--- a/man/git-rebase-patch.html
+++ b/man/git-rebase-patch.html
@@ -113,7 +113,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Niklas Fiekas &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x6e;&#105;&#x6b;&#108;&#97;&#115;&#x2e;&#x66;&#x69;&#x65;&#107;&#x61;&#115;&#x40;&#x74;&#117;&#x2d;&#99;&#108;&#x61;&#117;&#x73;&#x74;&#x68;&#97;&#108;&#46;&#x64;&#x65;" data-bare-link="true">&#x6e;&#105;&#107;&#x6c;&#x61;&#x73;&#x2e;&#102;&#105;&#x65;&#x6b;&#97;&#x73;&#x40;&#116;&#x75;&#45;&#99;&#108;&#97;&#117;&#x73;&#116;&#104;&#97;&#x6c;&#46;&#x64;&#x65;</a>&gt;</p>
+<p>Written by Niklas Fiekas &lt;<a href="&#x6d;&#x61;&#x69;&#108;&#116;&#111;&#58;&#x6e;&#x69;&#107;&#108;&#x61;&#115;&#46;&#x66;&#105;&#x65;&#107;&#97;&#x73;&#x40;&#x74;&#117;&#45;&#x63;&#108;&#97;&#x75;&#115;&#116;&#104;&#x61;&#x6c;&#x2e;&#x64;&#x65;" data-bare-link="true">&#x6e;&#x69;&#107;&#108;&#x61;&#115;&#46;&#x66;&#x69;&#x65;&#107;&#97;&#x73;&#64;&#x74;&#117;&#x2d;&#x63;&#x6c;&#97;&#117;&#x73;&#116;&#104;&#x61;&#108;&#46;&#100;&#x65;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -126,7 +126,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-rebase-patch(1)</li>
   </ol>
 
diff --git a/man/git-refactor.1 b/man/git-refactor.1
index f2cea3939..6c14de061 100644
--- a/man/git-refactor.1
+++ b/man/git-refactor.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-REFACTOR" "1" "April 2015" "" ""
+.TH "GIT\-REFACTOR" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-refactor\fR \- Create refactor branch
diff --git a/man/git-refactor.html b/man/git-refactor.html
index b1abb5342..4a1e2928f 100644
--- a/man/git-refactor.html
+++ b/man/git-refactor.html
@@ -104,7 +104,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jesús Espino &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x6a;&#101;&#x73;&#112;&#105;&#110;&#x6f;&#x67;&#x40;&#x67;&#109;&#x61;&#105;&#x6c;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#106;&#x65;&#115;&#x70;&#x69;&#x6e;&#111;&#103;&#64;&#x67;&#x6d;&#x61;&#105;&#108;&#x2e;&#x63;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Jesús Espino &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#106;&#x65;&#115;&#x70;&#105;&#110;&#x6f;&#x67;&#x40;&#x67;&#109;&#x61;&#105;&#108;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#101;&#x73;&#x70;&#x69;&#110;&#x6f;&#x67;&#x40;&#x67;&#x6d;&#97;&#x69;&#x6c;&#x2e;&#99;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -117,7 +117,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-refactor(1)</li>
   </ol>
 
diff --git a/man/git-release.1 b/man/git-release.1
index 9bc2f22c2..fb0052834 100644
--- a/man/git-release.1
+++ b/man/git-release.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-RELEASE" "1" "April 2015" "" ""
+.TH "GIT\-RELEASE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-release\fR \- Commit, tag and push changes to the repository
diff --git a/man/git-release.html b/man/git-release.html
index 0847be1fd..4cbf24db5 100644
--- a/man/git-release.html
+++ b/man/git-release.html
@@ -124,8 +124,8 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#116;&#x6a;&#x40;&#x76;&#x69;&#115;&#105;&#x6f;&#x6e;&#45;&#x6d;&#101;&#100;&#105;&#x61;&#x2e;&#99;&#97;" data-bare-link="true">&#x74;&#106;&#x40;&#x76;&#105;&#x73;&#x69;&#111;&#110;&#45;&#109;&#x65;&#100;&#105;&#97;&#x2e;&#x63;&#x61;</a>&gt;
-Extended by David Hartmann &lt;<a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#100;&#104;&#64;&#x74;&#115;&#x6c;&#x2e;&#105;&#111;" data-bare-link="true">&#100;&#x68;&#x40;&#116;&#x73;&#108;&#46;&#x69;&#x6f;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#116;&#x6a;&#64;&#x76;&#105;&#115;&#x69;&#x6f;&#x6e;&#x2d;&#109;&#x65;&#100;&#105;&#x61;&#x2e;&#99;&#x61;" data-bare-link="true">&#116;&#106;&#x40;&#x76;&#x69;&#115;&#x69;&#x6f;&#x6e;&#x2d;&#x6d;&#101;&#x64;&#x69;&#x61;&#46;&#x63;&#x61;</a>&gt;
+Extended by David Hartmann &lt;<a href="&#109;&#97;&#105;&#x6c;&#116;&#111;&#58;&#100;&#104;&#64;&#x74;&#115;&#x6c;&#x2e;&#x69;&#111;" data-bare-link="true">&#x64;&#104;&#64;&#116;&#x73;&#x6c;&#x2e;&#105;&#x6f;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -138,7 +138,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-release(1)</li>
   </ol>
 
diff --git a/man/git-rename-tag.1 b/man/git-rename-tag.1
index ac1e59405..2f39a124d 100644
--- a/man/git-rename-tag.1
+++ b/man/git-rename-tag.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-RENAME\-TAG" "1" "April 2015" "" ""
+.TH "GIT\-RENAME\-TAG" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-rename\-tag\fR \- Rename a tag
diff --git a/man/git-rename-tag.html b/man/git-rename-tag.html
index fe562371e..461d07593 100644
--- a/man/git-rename-tag.html
+++ b/man/git-rename-tag.html
@@ -115,7 +115,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jesús Espino &lt;<a href="&#109;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#106;&#x65;&#115;&#x70;&#105;&#x6e;&#x6f;&#103;&#64;&#x67;&#x6d;&#97;&#x69;&#x6c;&#46;&#99;&#111;&#109;" data-bare-link="true">&#106;&#x65;&#115;&#112;&#105;&#x6e;&#111;&#x67;&#x40;&#103;&#109;&#x61;&#x69;&#108;&#46;&#x63;&#x6f;&#109;</a>&gt;</p>
+<p>Written by Jesús Espino &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#106;&#x65;&#115;&#x70;&#105;&#110;&#x6f;&#x67;&#x40;&#x67;&#109;&#x61;&#105;&#108;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#101;&#x73;&#x70;&#x69;&#110;&#x6f;&#x67;&#x40;&#x67;&#x6d;&#97;&#x69;&#x6c;&#x2e;&#99;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -128,7 +128,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-rename-tag(1)</li>
   </ol>
 
diff --git a/man/git-repl.1 b/man/git-repl.1
index ccef61255..6c08b6d9f 100644
--- a/man/git-repl.1
+++ b/man/git-repl.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-REPL" "1" "April 2015" "" ""
+.TH "GIT\-REPL" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-repl\fR \- git read\-eval\-print\-loop
diff --git a/man/git-repl.html b/man/git-repl.html
index fcfa810ee..39cfb3869 100644
--- a/man/git-repl.html
+++ b/man/git-repl.html
@@ -104,7 +104,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#x61;&#105;&#108;&#116;&#x6f;&#58;&#x74;&#x6a;&#x40;&#118;&#x69;&#x73;&#105;&#111;&#x6e;&#x2d;&#109;&#101;&#x64;&#105;&#97;&#x2e;&#99;&#x61;" data-bare-link="true">&#116;&#x6a;&#x40;&#x76;&#105;&#x73;&#x69;&#x6f;&#110;&#45;&#x6d;&#x65;&#100;&#x69;&#97;&#x2e;&#x63;&#97;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#97;&#105;&#x6c;&#116;&#111;&#58;&#116;&#106;&#64;&#x76;&#105;&#x73;&#x69;&#x6f;&#110;&#x2d;&#109;&#101;&#100;&#x69;&#x61;&#x2e;&#99;&#x61;" data-bare-link="true">&#x74;&#106;&#x40;&#x76;&#x69;&#115;&#x69;&#x6f;&#x6e;&#45;&#x6d;&#x65;&#x64;&#x69;&#97;&#x2e;&#99;&#97;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -117,7 +117,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-repl(1)</li>
   </ol>
 
diff --git a/man/git-reset-file.1 b/man/git-reset-file.1
index a89d84271..3bbe141fe 100644
--- a/man/git-reset-file.1
+++ b/man/git-reset-file.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-RESET\-FILE" "1" "April 2015" "" ""
+.TH "GIT\-RESET\-FILE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-reset\-file\fR \- Reset one file
diff --git a/man/git-reset-file.html b/man/git-reset-file.html
index 70b353783..3d57457ed 100644
--- a/man/git-reset-file.html
+++ b/man/git-reset-file.html
@@ -106,7 +106,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Sasha Khamkov &lt;<a href="&#109;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#115;&#x61;&#110;&#x75;&#115;&#x61;&#x72;&#116;&#64;&#x67;&#x6d;&#97;&#x69;&#x6c;&#46;&#99;&#111;&#109;" data-bare-link="true">&#115;&#x61;&#110;&#117;&#115;&#x61;&#114;&#x74;&#x40;&#103;&#109;&#x61;&#x69;&#108;&#46;&#x63;&#x6f;&#109;</a>&gt;</p>
+<p>Written by Sasha Khamkov &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x73;&#97;&#x6e;&#x75;&#115;&#97;&#x72;&#x74;&#64;&#x67;&#x6d;&#97;&#105;&#108;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#115;&#97;&#x6e;&#x75;&#115;&#x61;&#x72;&#x74;&#x40;&#x67;&#109;&#97;&#105;&#x6c;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -119,7 +119,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-reset-file(1)</li>
   </ol>
 
diff --git a/man/git-root.1 b/man/git-root.1
index 4349058f7..9a2eafb5b 100644
--- a/man/git-root.1
+++ b/man/git-root.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-ROOT" "1" "April 2015" "" ""
+.TH "GIT\-ROOT" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-root\fR \- show path of root
diff --git a/man/git-root.html b/man/git-root.html
index e786369cb..d444bebe8 100644
--- a/man/git-root.html
+++ b/man/git-root.html
@@ -104,7 +104,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by spacewander &lt;<a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#x73;&#x70;&#97;&#x63;&#x65;&#119;&#x61;&#110;&#100;&#101;&#x72;&#108;&#x7a;&#x78;&#x40;&#103;&#109;&#x61;&#105;&#x6c;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#x73;&#x70;&#x61;&#x63;&#101;&#x77;&#97;&#x6e;&#100;&#101;&#x72;&#x6c;&#122;&#120;&#64;&#x67;&#x6d;&#x61;&#x69;&#108;&#46;&#99;&#111;&#109;</a>&gt;</p>
+<p>Written by spacewander &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x73;&#112;&#x61;&#x63;&#101;&#119;&#x61;&#x6e;&#100;&#x65;&#x72;&#108;&#122;&#120;&#64;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#x73;&#x70;&#x61;&#x63;&#101;&#119;&#97;&#x6e;&#x64;&#101;&#114;&#x6c;&#122;&#x78;&#x40;&#x67;&#109;&#97;&#x69;&#x6c;&#46;&#x63;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -117,7 +117,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-root(1)</li>
   </ol>
 
diff --git a/man/git-scp.1 b/man/git-scp.1
index 23e09e75b..636b1a523 100644
--- a/man/git-scp.1
+++ b/man/git-scp.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-SCP" "1" "April 2015" "" ""
+.TH "GIT\-SCP" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-scp\fR \- Copy files to SSH compatible \fBgit\-remote\fR
diff --git a/man/git-scp.html b/man/git-scp.html
index a66b93094..ebfc2d991 100644
--- a/man/git-scp.html
+++ b/man/git-scp.html
@@ -165,7 +165,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Chern Jie &lt;<a href="&#109;&#97;&#x69;&#x6c;&#116;&#x6f;&#58;&#108;&#x69;&#x6d;&#64;&#99;&#x68;&#x65;&#114;&#x6e;&#106;&#105;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#108;&#x69;&#x6d;&#x40;&#99;&#x68;&#x65;&#114;&#110;&#x6a;&#x69;&#x65;&#46;&#99;&#111;&#109;</a>&gt;</p>
+<p>Written by Chern Jie &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x6c;&#105;&#x6d;&#x40;&#99;&#104;&#x65;&#x72;&#110;&#x6a;&#x69;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6c;&#105;&#109;&#64;&#x63;&#x68;&#101;&#x72;&#x6e;&#x6a;&#x69;&#x65;&#46;&#99;&#111;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -178,7 +178,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-scp(1)</li>
   </ol>
 
diff --git a/man/git-sed.1 b/man/git-sed.1
index f637cd25d..d0bf6da57 100644
--- a/man/git-sed.1
+++ b/man/git-sed.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-SED" "1" "October 2015" "" ""
+.TH "GIT\-SED" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-sed\fR \- replace patterns in git\-controlled files
diff --git a/man/git-sed.html b/man/git-sed.html
index a89796d30..15f1eb09c 100644
--- a/man/git-sed.html
+++ b/man/git-sed.html
@@ -120,7 +120,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Antoine Beaupré &lt;<a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#97;&#110;&#x61;&#114;&#99;&#97;&#x74;&#64;&#100;&#x65;&#98;&#x69;&#x61;&#110;&#x2e;&#111;&#x72;&#103;" data-bare-link="true">&#97;&#x6e;&#x61;&#114;&#99;&#97;&#116;&#x40;&#x64;&#x65;&#x62;&#105;&#97;&#110;&#46;&#111;&#114;&#x67;</a>&gt; from
+<p>Written by Antoine Beaupré &lt;<a href="&#109;&#97;&#105;&#108;&#x74;&#x6f;&#x3a;&#x61;&#110;&#x61;&#x72;&#99;&#97;&#x74;&#x40;&#100;&#x65;&#x62;&#105;&#97;&#110;&#46;&#111;&#x72;&#103;" data-bare-link="true">&#97;&#110;&#x61;&#x72;&#99;&#x61;&#x74;&#x40;&#x64;&#x65;&#98;&#105;&#97;&#x6e;&#x2e;&#111;&#114;&#x67;</a>&gt; from
 inspiration by https://github.com/da-x/git-search-replace and
 http://stackoverflow.com/questions/9651898/is-there-a-git-sed-or-equivalent</p>
 
@@ -135,7 +135,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>October 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-sed(1)</li>
   </ol>
 
diff --git a/man/git-setup.1 b/man/git-setup.1
index f395e2310..add1257d0 100644
--- a/man/git-setup.1
+++ b/man/git-setup.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-SETUP" "1" "April 2015" "" ""
+.TH "GIT\-SETUP" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-setup\fR \- Set up a git repository
diff --git a/man/git-setup.html b/man/git-setup.html
index b3ba3889c..05f7321c7 100644
--- a/man/git-setup.html
+++ b/man/git-setup.html
@@ -95,7 +95,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Aggelos Orfanakos &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#97;&#103;&#x6f;&#114;&#102;&#64;&#x61;&#103;&#x6f;&#x72;&#x66;&#46;&#x67;&#x72;" data-bare-link="true">&#97;&#103;&#x6f;&#x72;&#102;&#64;&#x61;&#103;&#111;&#x72;&#102;&#x2e;&#103;&#x72;</a>&gt;</p>
+<p>Written by Aggelos Orfanakos &lt;<a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#x61;&#103;&#x6f;&#x72;&#x66;&#64;&#97;&#x67;&#x6f;&#114;&#x66;&#x2e;&#x67;&#x72;" data-bare-link="true">&#x61;&#103;&#x6f;&#x72;&#102;&#64;&#97;&#x67;&#x6f;&#114;&#x66;&#x2e;&#103;&#114;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +108,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-setup(1)</li>
   </ol>
 
diff --git a/man/git-show-merged-branches.1 b/man/git-show-merged-branches.1
index d1c8cc379..b261ba692 100644
--- a/man/git-show-merged-branches.1
+++ b/man/git-show-merged-branches.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-SHOW\-MERGED\-BRANCHES" "1" "April 2015" "" ""
+.TH "GIT\-SHOW\-MERGED\-BRANCHES" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-show\-merged\-branches\fR \- Show merged branches
diff --git a/man/git-show-merged-branches.html b/man/git-show-merged-branches.html
index 90c0d49f6..de854b8c0 100644
--- a/man/git-show-merged-branches.html
+++ b/man/git-show-merged-branches.html
@@ -88,7 +88,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Paul Schreiber &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x70;&#x61;&#x75;&#x6C;&#x73;&#x63;&#x68;&#x72;&#x65;&#x69;&#x62;&#x65;&#x72;&#x40;&#103;&#x6d;&#x61;&#x69;&#108;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x70;&#x61;&#x75;&#x6C;&#x73;&#x63;&#x68;&#x72;&#x65;&#x69;&#x62;&#x65;&#x72;&#64;&#x67;&#109;&#x61;&#105;&#x6c;&#x2e;&#x63;&#111;&#109;</a>&gt;</p>
+<p>Written by Paul Schreiber &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#x70;&#97;&#x75;&#x6c;&#x73;&#99;&#104;&#x72;&#x65;&#x69;&#x62;&#101;&#x72;&#x40;&#103;&#109;&#97;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#112;&#x61;&#x75;&#x6c;&#115;&#x63;&#104;&#x72;&#101;&#105;&#98;&#x65;&#x72;&#x40;&#103;&#109;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -101,7 +101,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-show-merged-branches(1)</li>
   </ol>
 
diff --git a/man/git-show-tree.1 b/man/git-show-tree.1
index 619cd34b5..0d0e77e5d 100644
--- a/man/git-show-tree.1
+++ b/man/git-show-tree.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-SHOW\-TREE" "1" "April 2015" "" ""
+.TH "GIT\-SHOW\-TREE" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-show\-tree\fR \- show branch tree of commit history
diff --git a/man/git-show-tree.html b/man/git-show-tree.html
index 8e08cfc70..4a8343b46 100644
--- a/man/git-show-tree.html
+++ b/man/git-show-tree.html
@@ -118,7 +118,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Nick Lombard <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#103;&#x69;&#x74;&#x68;&#117;&#98;&#64;&#x6a;&#105;&#103;&#115;&#111;&#x66;&#x74;&#x2e;&#99;&#111;&#46;&#x7a;&#x61;" data-bare-link="true">&#103;&#x69;&#x74;&#x68;&#117;&#98;&#x40;&#x6a;&#x69;&#103;&#x73;&#x6f;&#102;&#x74;&#46;&#99;&#x6f;&#x2e;&#x7a;&#x61;</a></p>
+<p>Written by Nick Lombard <a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x67;&#105;&#x74;&#x68;&#x75;&#98;&#64;&#x6a;&#x69;&#x67;&#115;&#111;&#102;&#x74;&#x2e;&#x63;&#x6f;&#46;&#x7a;&#97;" data-bare-link="true">&#103;&#105;&#116;&#x68;&#117;&#x62;&#64;&#x6a;&#x69;&#103;&#x73;&#x6f;&#102;&#116;&#46;&#x63;&#111;&#46;&#x7a;&#x61;</a></p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -131,7 +131,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-show-tree(1)</li>
   </ol>
 
diff --git a/man/git-show-unmerged-branches.1 b/man/git-show-unmerged-branches.1
index 52233453a..4dc918239 100644
--- a/man/git-show-unmerged-branches.1
+++ b/man/git-show-unmerged-branches.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-SHOW\-UNMERGED\-BRANCHES" "1" "April 2015" "" ""
+.TH "GIT\-SHOW\-UNMERGED\-BRANCHES" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-show\-unmerged\-branches\fR \- Show unmerged branches
diff --git a/man/git-show-unmerged-branches.html b/man/git-show-unmerged-branches.html
index 68612477a..f6eeab544 100644
--- a/man/git-show-unmerged-branches.html
+++ b/man/git-show-unmerged-branches.html
@@ -88,7 +88,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Paul Schreiber &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x70;&#x61;&#x75;&#x6C;&#x73;&#x63;&#x68;&#x72;&#x65;&#x69;&#x62;&#x65;&#x72;&#x40;&#103;&#x6d;&#x61;&#x69;&#108;&#x2e;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x70;&#x61;&#x75;&#x6C;&#x73;&#x63;&#x68;&#x72;&#x65;&#x69;&#x62;&#x65;&#x72;&#64;&#x67;&#109;&#x61;&#105;&#x6c;&#x2e;&#x63;&#111;&#109;</a>&gt;</p>
+<p>Written by Paul Schreiber &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#x70;&#97;&#x75;&#x6c;&#x73;&#99;&#104;&#x72;&#x65;&#x69;&#x62;&#101;&#x72;&#x40;&#103;&#109;&#97;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#112;&#x61;&#x75;&#x6c;&#115;&#x63;&#104;&#x72;&#101;&#105;&#98;&#x65;&#x72;&#x40;&#103;&#109;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -101,7 +101,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-show-unmerged-branches(1)</li>
   </ol>
 
diff --git a/man/git-squash.1 b/man/git-squash.1
index 07a47c608..12151c32e 100644
--- a/man/git-squash.1
+++ b/man/git-squash.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-SQUASH" "1" "April 2015" "" ""
+.TH "GIT\-SQUASH" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-squash\fR \- Import changes from a branch
diff --git a/man/git-squash.html b/man/git-squash.html
index d1ba34d80..6396067dd 100644
--- a/man/git-squash.html
+++ b/man/git-squash.html
@@ -112,7 +112,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Jesús Espino &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#106;&#x65;&#x73;&#x70;&#105;&#110;&#111;&#x67;&#64;&#103;&#109;&#97;&#x69;&#x6c;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#x65;&#115;&#x70;&#x69;&#x6e;&#111;&#103;&#x40;&#x67;&#x6d;&#97;&#x69;&#x6c;&#46;&#x63;&#111;&#109;</a>&gt;</p>
+<p>Written by Jesús Espino &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#58;&#x6a;&#101;&#x73;&#x70;&#x69;&#110;&#111;&#x67;&#x40;&#x67;&#109;&#97;&#105;&#x6c;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#x6a;&#101;&#115;&#112;&#105;&#x6e;&#111;&#x67;&#64;&#x67;&#x6d;&#97;&#x69;&#x6c;&#46;&#99;&#111;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -125,7 +125,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-squash(1)</li>
   </ol>
 
diff --git a/man/git-summary.1 b/man/git-summary.1
index 088fc7b7a..463399cd3 100644
--- a/man/git-summary.1
+++ b/man/git-summary.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-SUMMARY" "1" "August 2015" "" "Git Extras"
+.TH "GIT\-SUMMARY" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-summary\fR \- Show repository summary
diff --git a/man/git-summary.html b/man/git-summary.html
index b2819c6d6..5b937a369 100644
--- a/man/git-summary.html
+++ b/man/git-summary.html
@@ -65,7 +65,7 @@
 
   <ol class='man-decor man-head man head'>
     <li class='tl'>git-summary(1)</li>
-    <li class='tc'>Git Extras</li>
+    <li class='tc'></li>
     <li class='tr'>git-summary(1)</li>
   </ol>
 
@@ -134,7 +134,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#116;&#x6a;&#64;&#118;&#105;&#x73;&#x69;&#111;&#110;&#45;&#109;&#x65;&#x64;&#x69;&#97;&#46;&#99;&#x61;" data-bare-link="true">&#116;&#106;&#x40;&#x76;&#105;&#115;&#x69;&#x6f;&#x6e;&#45;&#x6d;&#101;&#x64;&#105;&#97;&#x2e;&#99;&#97;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#116;&#106;&#x40;&#118;&#105;&#x73;&#x69;&#x6f;&#x6e;&#x2d;&#x6d;&#x65;&#x64;&#x69;&#97;&#46;&#99;&#x61;" data-bare-link="true">&#x74;&#106;&#x40;&#118;&#x69;&#115;&#x69;&#111;&#110;&#x2d;&#x6d;&#x65;&#x64;&#x69;&#x61;&#46;&#x63;&#x61;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -147,7 +147,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>August 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-summary(1)</li>
   </ol>
 
diff --git a/man/git-touch.1 b/man/git-touch.1
index 96cae7cca..708dc19ec 100644
--- a/man/git-touch.1
+++ b/man/git-touch.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-TOUCH" "1" "April 2015" "" ""
+.TH "GIT\-TOUCH" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-touch\fR \- Touch and add file to the index
diff --git a/man/git-touch.html b/man/git-touch.html
index db766fbb6..718da49a6 100644
--- a/man/git-touch.html
+++ b/man/git-touch.html
@@ -94,7 +94,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Alex McHale &lt;<a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#x6f;&#x3a;&#x61;&#x6c;&#101;&#120;&#109;&#99;&#x68;&#x61;&#108;&#x65;&#64;&#x67;&#109;&#x61;&#x69;&#x6c;&#x2e;&#99;&#111;&#x6d;" data-bare-link="true">&#x61;&#x6c;&#101;&#120;&#109;&#x63;&#104;&#x61;&#108;&#x65;&#64;&#x67;&#109;&#97;&#x69;&#108;&#46;&#99;&#111;&#109;</a>&gt;</p>
+<p>Written by Alex McHale &lt;<a href="&#109;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#x61;&#x6c;&#x65;&#x78;&#109;&#x63;&#104;&#x61;&#x6c;&#101;&#x40;&#103;&#109;&#97;&#x69;&#x6c;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#97;&#108;&#x65;&#x78;&#109;&#99;&#x68;&#x61;&#x6c;&#101;&#x40;&#103;&#x6d;&#97;&#x69;&#108;&#46;&#99;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -107,7 +107,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-touch(1)</li>
   </ol>
 
diff --git a/man/git-undo.1 b/man/git-undo.1
index e76e1da3d..900047803 100644
--- a/man/git-undo.1
+++ b/man/git-undo.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-UNDO" "1" "April 2015" "" ""
+.TH "GIT\-UNDO" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-undo\fR \- Remove latest commits
diff --git a/man/git-undo.html b/man/git-undo.html
index d0df649e2..c26b5a7c3 100644
--- a/man/git-undo.html
+++ b/man/git-undo.html
@@ -110,7 +110,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Kenneth Reitz &lt;<a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#109;&#x65;&#x40;&#x6b;&#101;&#110;&#110;&#x65;&#116;&#104;&#114;&#101;&#x69;&#x74;&#x7a;&#46;&#99;&#111;&#x6d;" data-bare-link="true">&#x6d;&#101;&#x40;&#x6b;&#x65;&#110;&#110;&#x65;&#x74;&#x68;&#114;&#x65;&#x69;&#116;&#x7a;&#46;&#99;&#x6f;&#x6d;</a>&gt; and Nick Lombard &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x67;&#x69;&#x74;&#x68;&#117;&#98;&#64;&#106;&#x69;&#x67;&#115;&#x6f;&#102;&#x74;&#46;&#x63;&#x6f;&#x2e;&#x7a;&#97;" data-bare-link="true">&#103;&#x69;&#x74;&#x68;&#117;&#98;&#64;&#x6a;&#105;&#x67;&#115;&#x6f;&#102;&#x74;&#46;&#99;&#x6f;&#46;&#122;&#97;</a>&gt;</p>
+<p>Written by Kenneth Reitz &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#109;&#101;&#x40;&#107;&#101;&#x6e;&#x6e;&#x65;&#x74;&#x68;&#x72;&#x65;&#x69;&#x74;&#122;&#46;&#99;&#x6f;&#x6d;" data-bare-link="true">&#109;&#x65;&#64;&#x6b;&#101;&#x6e;&#110;&#101;&#x74;&#x68;&#x72;&#x65;&#x69;&#x74;&#122;&#x2e;&#x63;&#x6f;&#x6d;</a>&gt; and Nick Lombard &lt;<a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#103;&#105;&#x74;&#x68;&#x75;&#x62;&#64;&#x6a;&#105;&#x67;&#x73;&#111;&#x66;&#116;&#46;&#99;&#x6f;&#x2e;&#x7a;&#x61;" data-bare-link="true">&#x67;&#105;&#116;&#104;&#x75;&#x62;&#64;&#106;&#x69;&#x67;&#x73;&#111;&#x66;&#116;&#x2e;&#99;&#x6f;&#46;&#122;&#97;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -123,7 +123,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-undo(1)</li>
   </ol>
 
diff --git a/man/git-unlock.1 b/man/git-unlock.1
index 26e42fb14..827e12136 100644
--- a/man/git-unlock.1
+++ b/man/git-unlock.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-UNLOCK" "1" "April 2015" "" ""
+.TH "GIT\-UNLOCK" "1" "December 2015" "" ""
 .
 .SH "NAME"
 \fBgit\-unlock\fR \- Unlock a file excluded from version control
diff --git a/man/git-unlock.html b/man/git-unlock.html
index c5bf8f78c..8326a8687 100644
--- a/man/git-unlock.html
+++ b/man/git-unlock.html
@@ -95,7 +95,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Julio Napuri &lt;<a href="&#109;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#106;&#x75;&#x6c;&#105;&#x6f;&#110;&#99;&#x40;&#x67;&#x6d;&#97;&#105;&#108;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x6a;&#117;&#108;&#105;&#x6f;&#x6e;&#x63;&#x40;&#103;&#x6d;&#97;&#105;&#x6c;&#x2e;&#99;&#111;&#x6d;</a>&gt;</p>
+<p>Written by Julio Napuri &lt;<a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#58;&#x6a;&#117;&#x6c;&#105;&#111;&#110;&#x63;&#x40;&#x67;&#x6d;&#97;&#x69;&#108;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#117;&#108;&#x69;&#x6f;&#x6e;&#x63;&#x40;&#103;&#109;&#97;&#x69;&#x6c;&#46;&#99;&#x6f;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -108,7 +108,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>April 2015</li>
+    <li class='tc'>December 2015</li>
     <li class='tr'>git-unlock(1)</li>
   </ol>
 
diff --git a/man/index.txt b/man/index.txt
index f4c9da7fa..f21d5f6ab 100644
--- a/man/index.txt
+++ b/man/index.txt
@@ -6,6 +6,7 @@ git-back(1)                   git-back
 git-bug(1)                    git-bug
 git-changelog(1)              git-changelog
 git-chore(1)                  git-chore
+git-clear(1)                  git-clear
 git-commits-since(1)          git-commits-since
 git-contrib(1)                git-contrib
 git-count(1)                  git-count
@@ -23,6 +24,7 @@ git-fresh-branch(1)           git-fresh-branch
 git-gh-pages(1)               git-gh-pages
 git-graft(1)                  git-graft
 git-guilt(1)                  git-guilt
+git-ignore-io(1)              git-ignore-io
 git-ignore(1)                 git-ignore
 git-info(1)                   git-info
 git-line-summary(1)           git-line-summary
@@ -33,6 +35,7 @@ git-merge-into(1)             git-merge-into
 git-merge-repo(1)             git-merge-repo
 git-missing(1)                git-missing
 git-pr(1)                     git-pr
+git-psykorebase(1)            git-psykorebase
 git-rebase-patch(1)           git-rebase-patch
 git-refactor(1)               git-refactor
 git-release(1)                git-release
@@ -41,6 +44,7 @@ git-repl(1)                   git-repl
 git-reset-file(1)             git-reset-file
 git-root(1)                   git-root
 git-scp(1)                    git-scp
+git-sed(1)                    git-sed
 git-setup(1)                  git-setup
 git-show-merged-branches(1)   git-show-merged-branches
 git-show-tree(1)              git-show-tree

From a09eefde2538a19fe5868a3e005d57ebfe921efd Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 27 Dec 2015 15:02:55 -0500
Subject: [PATCH 28/57] Fix missing shebang in git-clear and missing +x on
 others

---
 bin/git-clear                  | 2 ++
 bin/git-show-merged-branches   | 0
 bin/git-show-unmerged-branches | 0
 3 files changed, 2 insertions(+)
 mode change 100644 => 100755 bin/git-show-merged-branches
 mode change 100644 => 100755 bin/git-show-unmerged-branches

diff --git a/bin/git-clear b/bin/git-clear
index 460ec0a10..6d2d5e69d 100755
--- a/bin/git-clear
+++ b/bin/git-clear
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 echo "Sure? - This command may delete files that cannot be recovered. [Y/n]"
 read ans
 if [ "$ans" != "n" ] 
diff --git a/bin/git-show-merged-branches b/bin/git-show-merged-branches
old mode 100644
new mode 100755
diff --git a/bin/git-show-unmerged-branches b/bin/git-show-unmerged-branches
old mode 100644
new mode 100755

From 4354cca46142520b5a1eca0b8aec8b7a188eaeb2 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Sun, 27 Dec 2015 16:24:26 -0500
Subject: [PATCH 29/57] Makefile: allow customizing of SYSCONFDIR (/etc)
 location

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a68ab189a..274d30bf5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 PREFIX ?= /usr/local
 BINPREFIX ?= "$(PREFIX)/bin"
 MANPREFIX ?= "$(PREFIX)/share/man/man1"
+SYSCONFDIR ?= /etc
 BINS = $(wildcard bin/git-*)
 MANS = $(wildcard man/git-*.md)
 MAN_HTML = $(MANS:.md=.html)
@@ -47,8 +48,8 @@ install:
 		cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
 		echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
 	fi
-	@mkdir -p $(DESTDIR)/etc/bash_completion.d
-	cp -f etc/bash_completion.sh $(DESTDIR)/etc/bash_completion.d/git-extras
+	@mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
+	cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras
 
 man/%.html: man/%.md
 	ronn \
@@ -72,7 +73,7 @@ uninstall:
 		echo "... uninstalling $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN))"; \
 		rm -f $(DESTDIR)$(MANPREFIX)/$(notdir $(MAN)); \
 	)
-	rm -f $(DESTDIR)/etc/bash_completion.d/git-extras
+	rm -f $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras
 
 clean: docclean
 

From cbad7c63eb75883802f6b70b5595efbcd6175863 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Mon, 28 Dec 2015 00:45:04 -0500
Subject: [PATCH 30/57] installation: put $SYSCONFDIR (/etc) under $PREFIX by
 default

---
 Installation.md | 44 ++++++++++++++++++++++++++++++++++++++++----
 Makefile        |  2 +-
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/Installation.md b/Installation.md
index 4956cb755..f75c60285 100644
--- a/Installation.md
+++ b/Installation.md
@@ -1,17 +1,23 @@
-## Debian
+# Installing git-extras
+
+## Installing with a package manager
+
+### Debian
 
 ```bash
 $ sudo $apt_pref update
 $ sudo $apt_pref install git-extras
 ```
 
-## Mac
+### Mac OS X with Homebrew
 
 ```bash
 $ brew install git-extras
 ```
 
-## Clone / Tarball:
+## Building from source
+
+Obtain the git-extras source by cloning [its GitHub repo](https://github.com/tj/git-extras.git) or downloading a tarball of a [release](https://github.com/tj/git-extras/releases). Then install it by doing `make install` from the source tree.
 
 ```bash
 $ git clone https://github.com/tj/git-extras.git
@@ -21,12 +27,41 @@ $ git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
 $ [sudo] make install
 ```
 
+By default, git-extras is installed under `/usr/local`. To install it at an
+alternate location, specify a `PREFIX` when calling `make`.
+
+```bash
+# Non-root users can install under their home directory
+make install PREFIX=$HOME/software
+
+# For third-party software kept under /opt
+make install PREFIX=/opt
+```
+
+If you want to relocate the bulk of the installation but still have configuration
+files installed to the system `/etc` dir or other alternate location, you can
+specify `SYSCONFDIR` in addition to `PREFIX`.
+
+```
+$ sudo make install PREFIX=/usr/local SYSCONFDIR=/etc
+```
+
+See the Makefile for details on advanced configuration options.
+
+## Installing from network
+
 One-liner:
 
 ```bash
 curl -sSL http://git.io/git-extras-setup | sudo bash /dev/stdin
 ```
 
+## Updating
+
+If you installed git-extras with a package manager, use that package manager's tools to update it.
+
+If you installed git-extras from source, you can run `git-extras update` to update it to the latest release. Be aware that this may lose any configuration options you specified during the original installation.
+
 ## Windows (use it at your own risk)
 
 First, please install `Git for Windows 2.x` from 'https://github.com/git-for-windows/git/releases'
@@ -48,6 +83,7 @@ install.cmd "C:\SCM\PortableGit\mingw64"
 
 Last, please copy `colrm.exe` and `column.exe` from `folder-your-msys2-installed/usr/bin` to
 `folder-your-git-installed/usr/bin`.
+
 Enjoy `git-extras`!
 
-[1]: http://sourceforge.net/projects/msys2/
\ No newline at end of file
+[1]: http://sourceforge.net/projects/msys2/
diff --git a/Makefile b/Makefile
index 274d30bf5..811e1cf89 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PREFIX ?= /usr/local
 BINPREFIX ?= "$(PREFIX)/bin"
 MANPREFIX ?= "$(PREFIX)/share/man/man1"
-SYSCONFDIR ?= /etc
+SYSCONFDIR ?= $(PREFIX)/etc
 BINS = $(wildcard bin/git-*)
 MANS = $(wildcard man/git-*.md)
 MAN_HTML = $(MANS:.md=.html)

From 176ebf9da18bfdea92f27119abc45a8e4f1c32dc Mon Sep 17 00:00:00 2001
From: Nimit Kalra <nimit@nimitkalra.com>
Date: Mon, 28 Dec 2015 01:32:21 -0600
Subject: [PATCH 31/57] Update AUTHORS.

---
 AUTHORS | 156 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 135 insertions(+), 21 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b2481f52e..abca9c528 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,31 +3,145 @@ various contributors:
 
 Development Lead
 ````````````````
-
 - TJ Holowaychuk <tj@vision-media.ca>
 
-Maintainer
-````````````````
+Maintainers
+```````````
 - Hemanth.HM <hemanth.hm@gmail.com>
+- Nimit Kalra <me@nimit.io>
 
 Patches and Suggestions
 ```````````````````````
-
-- Mark Eissler
-- Chern Jie
-- Kenneth Reitz
-- Aggelos Orfanakos
-- Jonathan "Duke" Leto
-- Domenico Rotiroti
-- Jason Young
-- Nick Campbell
-- Jonhnny Weslley
-- Alex McHale
-- Gert Van Gool
-- Devin Withers
-- David Baumgold
-- Leila Muhtasib
+- Nicolai Skogheim <nicolai.skogheim@gmail.com>
+- Jonhnny Weslley <jw@jonhnnyweslley.net>
+- spacewander <spacewanderlzx@gmail.com>
+- LeeW <cl87654321@gmail.com>
+- nickl- <github@jigsoft.co.za>
+- CJ <lim@chernjie.com>
+- timfeirg <kkcocogogo@gmail.com>
+- Mark Eissler <mark@mixtur.com>
+- Leila Muhtasib <muhtasib@gmail.com>
+- Jesús Espino <jesus.espino@kaleidos.net>
+- Kenneth Reitz <me@kennethreitz.com>
+- David Baumgold <david@davidbaumgold.com>
+- Sasha Khamkov <sanusart@gmail.com>
+- Andrew Janke <andrew@apjanke.net>
+- Chris Hall <christopher.k.hall@gmail.com>
+- grindhold <grindhold@gmx.net>
+- Camille Reynders <camille.reynders@ibbt.be>
+- Damian Krzeminski <dkrzemin@gmail.com>
+- NANRI <southly@gmail.com>
+- Aggelos Orfanakos <agorf@agorf.gr>
+- Phally <info@frankdegraaf.net>
+- Rémy HUBSCHER <rhubscher@mozilla.com>
+- Alexander Krasnukhin <the.malkolm@gmail.com>
+- gisphm <phmfk@hotmail.com>
+- Jan Schulz <jasc@gmx.net>
+- Jonathan "Duke" Leto <jonathan@leto.net>
+- wooorm <tituswormer@gmail.com>
+- Brian J Brennan <brianloveswords@gmail.com>
+- Ivan Malopinsky <ivan@imsky.org>
+- Nimit Kalra <me@nimit.io>
+- Philipp Klose <me@thehippo.de>
+- Nils Winkler <nils@nilswinkler.com>
+- Julio Napurí <julionc@gmail.com>
+- Hogan Long <hoganlong@gmail.com>
+- Domenico Rotiroti <drotiro@tiscali.it>
+- Alexis GRIMALDI <alexis.grimaldi@gmail.com>
+- Andre Cerqueira <me@andrecerqueira.com>
+- Curtis McEnroe <programble@gmail.com>
+- Devin Withers <dwithers@kionix.com>
+- Evan Grim <evan@mirgnave.com>
+- Florian H <jscoderr@gmail.com>
+- Gert Van Gool <gertvangool@gmail.com>
+- Guillaume Seren <guillaumeseren@gmail.com>
+- Jean Jordaan <jean.jordaan@gmail.com>
+- Justin Guenther <jguenther@gmail.com>
+- Kylie McClain <somasissounds@gmail.com>
+- Marc Harter <wavded@gmail.com>
+- Nate Jones <nate@endot.org>
+- Newell Zhu <zlx.star@gmail.com>
+- Patryk Małek <malekpatryk@gmail.com>
+- Paul Schreiber <paul.schreiber@espn.com>
+- Richard Littauer <richard.littauer@gmail.com>
+- Rico Sta. Cruz <rstacruz@users.noreply.github.com>
+- Tom Vincent <git@tlvince.com>
+- Wil Moore III <wil.moore@wilmoore.com>
+- go2null <1t1is2@gmail.com>
+- luozexuan <zexuan.lzx@alibaba-inc.com>
+- phigoro <phigoro@users.noreply.github.com>
+- soffolk <lianxin.zhu@easyread.ly>
+- Joshua Appelman <jappelman@xebia.com>
+- jykntr <jykntr@gmail.com>
+- Adam Parkin <aparkin@seekersolutions.com>
+- Kevin Woo <kevinawoo@gmail.com>
+- Konstantin Schukraft <konstantin@schukraft.org>
+- Akim Demaille <akim@lrde.epita.fr>
+- Leandro López <inkel.ar@gmail.com>
+- David Hartmann <dh@thesilverlogic.com>
+- Dave James Miller <dave@davejamesmiller.com>
+- Maarten Winter <mw@one.com>
+- meza <meza@meza.hu>
+- Daniel Schildt <daniel@autiomaa.org>
+- Mathieu D. (MatToufoutu) <mattoufootu@gmail.com>
+- Matt Colyer <matt@colyer.name>
+- Matthew Avant <mavant@palantir.com>
+- Michael Komitee <mkomitee@gmail.com>
+- Michael Matuzak <michael@lambdaphant.com>
+- Moritz Grauel <mo@notadomain.com>
+- Dan Jackson <e28eta@yahoo.com>
+- neydroid <joseneyguerrero@gmail.com>
+- Nathan Rajlich <nathan@tootallnate.net>
+- Amir Tocker <tocker.signup@gmail.com>
+- Nick Campbell <ncampbell@siteworx.com>
+- Nick Payne <nick@kurai.co.uk>
+- Craig MacGregor <craigerm@gmail.com>
+- Niklas Fiekas <niklas.fiekas@googlemail.com>
+- Ciro Nunes <ciroanunes@gmail.com>
+- Carl Casbolt <carl.casbolt@gmail.com>
+- nulltask <nulltask@gmail.com>
+- Bruno Sutic <bruno.sutic@gmail.com>
+- Brandon Zylstra <brandon.zylstra@gmail.com>
+- Raphael Fleischlin <raphael.fleischlin@gmail.com>
+- Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
+- Riceball LEE <snowyu.lee@gmail.com>
+- zeroDivisible <zerodivisible@gmail.com>
+- ☃ pitr <pitr.vern@gmail.com>
+- Rob Kennedy <kennedyri@gmail.com>
+- Ryan Bohn <rbohn@biohitech.com>
+- Ben Parnell <benjaminparnell.94@gmail.com>
+- Sam Thursfield <sam.thursfield@codethink.co.uk>
+- Balazs Nadasdi <yitsushi@gmail.com>
+- Stephen Mathieson <smath23@gmail.com>
+- Steve Mao <maochenyan@gmail.com>
+- Aurélien Scoubeau <aurelien.scoubeau@gmail.com>
+- Antoine Beaupré <anarcat@koumbit.org>
+- Todd Wolfson <todd@twolfson.com>
+- Tony <zearin@gonk.net>
+- TweeKane <tweekane@gmail.com>
+- Valérian Galliat <val@codejam.info>
+- Allan Odgaard <github@simplit.com>
+- Xiaopei Li <toksea@gmail.com>
+- creynders <camille.reynders@gmail.com>
+- dead-horse <dead_horse@qq.com>
+- eszabpt <peter.szabados@ericsson.com>
+- Andy <mail@andrewgriffithsonline.com>
+- Alex McHale <alexmchale@gmail.com>
+- Andrew Starr-Bochicchio <a.starr.b@gmail.com>
+- Jan Krueger <jan278@googlemail.com>
+- James Manning <james.manning@gmail.com>
+- Jarod Stewart <StewartJarod@users.noreply.github.com>
+- Jason Young <a.young.jason@gmail.com>
+- Andrei Petcu <andreicristianpetcu@gmail.com>
+- Jens K. Mueller <jkm@gluey.org>
+- Jesse Sipprell <jsipprell@mcclatchyinteractive.com>
+- Gunnlaugur Thor Briem <gunnlaugur@gmail.com>
+- Jianjin Fan <fanjianjin@xiaomi.com>
+- Johannes Ewald <johannes.ewald@peerigon.com>
+- John Hoffmann <jhoffmann@sugarcrm.com>
+- Jon Ander Peñalba <jonander.penalba@ticketbis.com>
+- Guillermo Rauch <rauchg@gmail.com>
+- Greg Allen <me@jga.me>
+- Emil Kjelsrud <emilkje@gmail.com>
+- Dung Quang <nxqd.inbox+rhacker@gmail.com>
 - Duane Johnson
-- Todd Wolfson
-- Niklas Fiekas
-- Paul Schreiber

From 3c874ce9f4694674e1f476b6ee4a116dd16a7178 Mon Sep 17 00:00:00 2001
From: David Rogers <al-the-x@users.noreply.github.com>
Date: Fri, 30 Oct 2015 22:12:16 -0400
Subject: [PATCH 32/57] Use `$@` instead of `$*` re #467

Blind first pass so that I have a PR to remind me...
---
 bin/git-touch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/git-touch b/bin/git-touch
index 25627f7c5..0cccada8a 100755
--- a/bin/git-touch
+++ b/bin/git-touch
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-filename="$*"
+test $# -lt 1 && echo "filename required" 1>&2 && exit 1
 
-test -z "$filename" && echo "filename required" 1>&2 && exit 1
+filenames="$@"
 
-touch "$filename" \
-  && git add "$filename"
+touch "$filenames" \
+  && git add "$filenames"

From 64639e1437ab9d1b9b43dc698190f2f65b3c6564 Mon Sep 17 00:00:00 2001
From: David Rogers <hello@al-the-x.me>
Date: Mon, 28 Dec 2015 14:06:30 -0500
Subject: [PATCH 33/57] Touch multiple files supplied

---
 bin/git-touch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/git-touch b/bin/git-touch
index 0cccada8a..101eaf368 100755
--- a/bin/git-touch
+++ b/bin/git-touch
@@ -4,5 +4,7 @@ test $# -lt 1 && echo "filename required" 1>&2 && exit 1
 
 filenames="$@"
 
-touch "$filenames" \
-  && git add "$filenames"
+for filename in $@; do
+  touch "$filename" \
+    && git add "$filename"
+done

From 2b042bdd594def51a97d96aa7919307853ab2c06 Mon Sep 17 00:00:00 2001
From: David Rogers <hello@al-the-x.me>
Date: Mon, 28 Dec 2015 14:07:09 -0500
Subject: [PATCH 34/57] Better USAGE message

---
 bin/git-touch | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/git-touch b/bin/git-touch
index 101eaf368..05b715880 100755
--- a/bin/git-touch
+++ b/bin/git-touch
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 
-test $# -lt 1 && echo "filename required" 1>&2 && exit 1
+USAGE(){
+  echo "git touch <filename> [ <filename> . . .]" 1>&2
+  exit 1
+}
 
-filenames="$@"
+test $# -lt 1 && USAGE
 
 for filename in $@; do
   touch "$filename" \

From bb02bdcd55865d855be219242b488cd359f3a807 Mon Sep 17 00:00:00 2001
From: Nimit Kalra <nimit@nimitkalra.com>
Date: Mon, 28 Dec 2015 22:32:11 -0600
Subject: [PATCH 35/57] Add David Rogers to AUTHORS.

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index abca9c528..e261b6078 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -144,4 +144,5 @@ Patches and Suggestions
 - Greg Allen <me@jga.me>
 - Emil Kjelsrud <emilkje@gmail.com>
 - Dung Quang <nxqd.inbox+rhacker@gmail.com>
+- David Rogers <hello@al-the-x.me>
 - Duane Johnson

From 94556f380b2196c55adbab0ebc5a011d2f8c2d8b Mon Sep 17 00:00:00 2001
From: Nimit Kalra <nimit@nimitkalra.com>
Date: Mon, 28 Dec 2015 22:42:20 -0600
Subject: [PATCH 36/57] Version 4.0.0

---
 History.md     | 225 +++++++++++++++++++++++++++++++++++++++++++++++++
 bin/git-extras |   2 +-
 2 files changed, 226 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 9aa35ff50..f8fc90b84 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,229 @@
 
+4.0.0 / 2015-12-28
+==================
+
+  * Add David Rogers to AUTHORS.
+  * Merge pull request #481 from al-the-x/multi-file-touch
+  * Better USAGE message
+  * Touch multiple files supplied
+  * Use `$@` instead of `$*` re #467
+  * Update AUTHORS.
+  * Merge pull request #490 from apjanke/etc-under-prefix
+  * installation: put $SYSCONFDIR (/etc) under $PREFIX by default
+  * Merge pull request #489 from apjanke/customize-etcdir
+  * Makefile: allow customizing of SYSCONFDIR (/etc) location
+  * Merge pull request #488 from apjanke/git-clear-shebang
+  * Fix missing shebang in git-clear and missing +x on others
+  * Update all man pages.
+  * Merge pull request #479 from JanSchulz/global_gitignore
+  * Merge pull request #448 from Lee-W/master
+  * Add more info how to set global gitignore
+  * Regenerate git-changelog man pages (.html and .1) for #471.
+  * Merge pull request #471 from JanSchulz/merge-changelog
+  * git-changelog: option to only use merges
+  * Merge pull request #469 from JanSchulz/windows-install
+  * Merge pull request #468 from spacewander/use-real-purplish
+  * Use the default installation path in install.cmd
+  * use real purplish
+  * Merge pull request #466 from anarcat/master
+  * Merge pull request #465 from spacewander/fix-color
+  * add simple sed command
+  * disable color if the output is not printed to tty
+  * replace wildcard '?' to literal '?'
+  * git-scp: use portable terminal escape sequences
+  * Merge pull request #460 from apjanke/summary-defensive-locale
+  * Merge pull request #458 from apjanke/makefile-refactor-libs
+  * Merge pull request #459 from apjanke/effort-portable-colors
+  * git-summary: protect against character encoding issues with LC_ALL=C
+  * git-effort: use portable terminal escape sequences
+  * Makefile: refactor is-git-repo inclusion logic
+  * Merge pull request #454 from apjanke/makefile-escape-mktemp
+  * Makefile: escape $ used inside eval as shell variable
+  * Merge pull request #453 from jhnns/pr-url
+  * Add possibility to also checkout pull requests based on GitHub urls
+  * Merge pull request #452 from akimd/summary-locale
+  * summary: beware of locale issues, and pass options to line-summary
+  * Merge pull request #443 from Natim/patch-1
+  * Merge pull request #444 from spacewander/install_without_alias
+  * Merge pull request #446 from ssssam/fix-active-days
+  * Merge pull request #447 from RichardLitt/patch-1
+  * Update git-ignore-io mannual
+  * Replace "export" option with "replace" in git-ignore-io
+  * Remove exclamation mark
+  * Remove warning when search without word.
+  * Fix typo
+  * Add warning when there is not argument after search, append and export
+  * Fix ~/.gi_list not exist problem
+  * Alphabetized list
+  * effort, summary: Correctly estimate the number of active days
+  * Merge pull request #445 from nicolaiskogheim/straighten-up-effort
+  * effort: change order of arguments to function
+  * effort: add usage message
+  * effort: More robust argument parsing
+  * add alias conflict prompt
+  * Merge pull request #440 from spacewander/features/feature-alias
+  * Add full name for list option
+  * Fix usage error
+  * Make sure git-authors doesn't return twice the same one.
+  * update git-feature docs
+  * add alias to git-feature
+  * Modify print_last_modified_time to make it Linux compatible
+  * Merge pull request #441 from spacewander/features/remove-checkout
+  * Merge branch 'master' of https://github.com/Lee-W/git-extras
+  * Fix doc error for git-ignore-io
+  * Fix doc error for git-ignore-io
+  * Remove redundant \n in tr
+  * Not to update list each time git-ignore-io is executed
+  * Refactor git-ignore-io and remove .gitignore
+  * Update manual and description in Commands
+  * remove duplicate checkout
+  * Generate manual using ronn for git-ignore-io
+  * Finish manual for git-ignore-io
+  * Fix typo
+  * Add description to Commands.md for git-ignore-io
+  * Implement search function or git-ignore-io
+  * Remove help from git-ignore-io
+  * Init gitignore and ignore vim osx temp files
+  * Merge gi_extension project into git extras as git-ignore-io
+  * Merge pull request #436 from nwinkler/patch-1
+  * Merge pull request #437 from nwinkler/patch-2
+  * Fixed typo in install.sh
+  * Updated documentation for git-ignore
+  * Merge pull request #435 from nwinkler/patch-1
+  * Added details to git-pr documentation
+  * Merge pull request #433 from grindhold/git-clear
+  * made more precise security-question.
+  * more concise implementation of git-clear
+  * Fix typo in variable name
+  * added git-clear to Commands.md
+  * added manpage for git-clear
+  * implemented git-clear
+  * Merge pull request #432 from stevemao/patch-1
+  * fix link of `git feature|refactor|bug|chore`
+  * Merge pull request #425 from nicolaiskogheim/makefile-fix
+  * Mark default task as .PHONY
+  * Merge pull request #430 from spacewander/git-extras
+  * make it possible to update via `git extras`
+  * Merge pull request #428 from spacewander/update-commands
+  * Merge pull request #429 from nicolaiskogheim/merge-into-ff-only
+  * merge-into: change --ff option to --ff-only. fix #421
+  * update Commands.md
+  * Merge pull request #411 from Natim/add-psykorebase-command
+  * Improve man page presentation.
+  * Add documentation.
+  * Merge pull request #426 from spacewander/update-for-new-version
+  * change 'search-term' to 'search-pattern'
+  * abort git-alias when too many arguments given.
+  * Merge pull request #423 from nicolaiskogheim/effort-paths
+  * Merge pull request #424 from nicolaiskogheim/fork-docs
+  * Merge pull request #422 from nicolaiskogheim/effort-bugfix
+  * effort docs: add note about omitting unsorted results
+  * effort docs: add example with directories
+  * effort docs: filename -> path
+  * effort docs: Adjust numbers in example
+  * effort: rename 'file' to 'path' to be more accurate
+  * Set default make task to be install
+  * fork docs: change SSH to HTTPS in example
+  * effort: fix active days always 1
+  * Merge pull request #419 from nicolaiskogheim/git-guilt
+  * Merge pull request #420 from nicolaiskogheim/git-summary
+  * line-summary: 'function f{...' -> 'f() {...'
+  * line-summary: add missing quotation marks
+  * line-summary: tighten regex
+  * summary docs: Remove --line example
+  * summary docs: explain relation to git-line-summary
+  * summary docs: use correct order of arguments
+  * guilt: remove --help option
+  * guilt: document call without arguments
+  * guilt docs: Capitalize letters
+  * guilt: Adds simplified example
+  * Merge pull request #418 from nicolaiskogheim/fork-bugfix
+  * fork: http-urls had colon instead of slash
+  * Merge pull request #416 from nicolaiskogheim/fork-docs
+  * Merge pull request #415 from nicolaiskogheim/contrib-docs
+  * fork: original->upstream in docs
+  * contrib: update docs
+  * Merge pull request #414 from nicolaiskogheim/alias-docs
+  * alias: docs
+  * Add completion for git-psykorebase.
+  * Create a bash version of git-psykorebase — Fixes #411
+  * Merge pull request #409 from nicolaiskogheim/refactor-alias
+  * alias: polish the docs
+  * alias: bugfix
+  * Merge pull request #408 from nicolaiskogheim/refactor-contrib
+  * contrib: refactor, and conform to git
+  * Merge pull request #405 from nicolaiskogheim/fix-filenames-with-spaces
+  * Merge pull request #404 from nicolaiskogheim/freebsd-fix
+  * Merge pull request #406 from nicolaiskogheim/portable-msysgit
+  * git-alias: use sed insted of colrm
+  * git-changelog: use cp instead of mv
+  * git-extras: use git-help instead of man
+  * add install script for PortableGit(msysgit)
+  * Quote variables bc of filenames with spaces
+  * Guard against 'seq 0'
+  * Fix error on FreeBSD with process substitution
+  * Pass --import-functions if required
+  * Merge pull request #403 from andreicristianpetcu/master
+  * effort: documentation for git effort --since #326
+  * Merge pull request #401 from nicolaiskogheim/effort-above-error-on-NaN
+  * effort: error on bad value to --above
+  * Merge pull request #400 from nicolaiskogheim/fix-off-by-one
+  * Merge pull request #391 from nicolaiskogheim/effort-limit-commits
+  * Merge pull request #388 from chernjie/release
+  * Merge pull request #398 from nicolaiskogheim/git-graft
+  * Merge pull request #399 from nicolaiskogheim/git-archive-file
+  * archive-file: cleaner way to get current branch
+  * graft: Require destination branch. Fix #23
+  * effort: don't count untouched files
+  * Add info about new options to man pages
+  * Add completion for more options to effort
+  * Do proper argument parsing
+  * effort: allow sending options to log. Fix #326
+  * Merge pull request #396 from tocker/bug/changelog-catch-head
+  * Catch "HEAD -> master" when creating the changelog
+  * Merge pull request #394 from markeissler/changelog-signal-trap
+  * Remove unused var.
+  * Merge pull request #390 from nicolaiskogheim/effort-color-relative-to-above
+  * Handle signals in git-changelog.
+  * Meke coloring respect --above. Fix 74
+  * Merge pull request #392 from nicolaiskogheim/WIP-effort-parallelize
+  * Avoid spawning subshell
+  * Remove unnecessary call to cat
+  * perf: reduce calls to git log
+  * Parallelize git-effort with xargs
+  * Alter options to git log. Remove pipe
+  * cd man && ./manning-up.sh && git diff --stat | grep ' 2 ' | awk '{print }' | xargs git checkout --
+  * Merge pull request #386 from rstacruz/patch-2
+  * Use https for git-fork
+  * Merge pull request #385 from gisphm/master
+  * added windows installation section in the Installation.md
+  * format install.cmd
+  * add install.cmd for installation on windows
+  * Merge pull request #383 from Somasis/master
+  * Makefile: Use a more portable mktemp invocation
+  * Using shorter URL
+  * Merge pull request #381 from spacewander/master
+  * installation with curl and bash
+  * Merge pull request #380 from spacewander/master
+  * keep installation silent
+  * Merge pull request #378 from spacewander/master
+  * update installation in `git-extras update`
+  * Merge pull request #377 from go2null/master
+  * FIXes location of `--` for `grep`
+  * FIXes 'mktemp' to work again on Linux
+  * Merge pull request #373 from zlx/feature/document_line_summary
+  * Document for git-line-summary
+  * Merge pull request #372 from spacewander/patch-1
+  * install the latest release version of git-extras
+  * Merge pull request #370 from phigoro/master
+  * git-effort: replace "wc | cut" with "wc | awk"
+  * Merge pull request #369 from phigoro/master
+  * align hashbang of git-guilt & git-merge-into
+  * Merge pull request #368 from zlx/feature/strong_line_summary
+  * Fix Fatal for git-line-summary
+  * Merge pull request #365 from rkennedy/bug-ignore-regex2
+  * Don't treat ignored patterns as regexps
+
 3.0.0 / 2015-04-27
 ==================
 
diff --git a/bin/git-extras b/bin/git-extras
index 550c54712..38561798d 100755
--- a/bin/git-extras
+++ b/bin/git-extras
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="3.0.0"
+VERSION="4.0.0"
 INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh"
 
 update() {

From 39ed77253c03281a616b0e26564af3fb394a5da6 Mon Sep 17 00:00:00 2001
From: Nimit Kalra <me@nimit.io>
Date: Tue, 29 Dec 2015 00:03:19 -0600
Subject: [PATCH 37/57] Bump version to 4.1.0-dev.

---
 bin/git-extras | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/git-extras b/bin/git-extras
index 38561798d..be1c25ede 100755
--- a/bin/git-extras
+++ b/bin/git-extras
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="4.0.0"
+VERSION="4.1.0-dev"
 INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh"
 
 update() {

From 90ba942cf6824f361ed8aea21ca2eddad21f8f8c Mon Sep 17 00:00:00 2001
From: Nimit Kalra <me@nimit.io>
Date: Tue, 29 Dec 2015 12:31:11 -0600
Subject: [PATCH 38/57] Add Gitter badge.

---
 Readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index bed767607..fceffb658 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,5 +1,7 @@
 # Git Extras
 
+[![Gitter](https://img.shields.io/gitter/room/tj/git-extras.svg?style=flat-square)](https://gitter.im/tj/git-extras)
+
 Little git extras.
 
 ## Screencasts

From a1530d90f2b16b79863d9fcd596b2f733e0455b9 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 31 Dec 2015 20:28:13 -0500
Subject: [PATCH 39/57] Makefile: fix inverted list of commands that use
 is_git_repo

---
 Makefile                           | 2 +-
 need_git_repo => not_need_git_repo | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename need_git_repo => not_need_git_repo (54%)

diff --git a/Makefile b/Makefile
index 811e1cf89..aa159b703 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ install:
 			echo "... installing $(COMMAND)"; \
 			head -1 bin/$(COMMAND) > $(TEMPFILE); \
 			cat $(LIB) >> $(TEMPFILE); \
-			if grep "$(COMMAND)" need_git_repo >/dev/null; then \
+			if ! grep "$(COMMAND)" not_need_git_repo >/dev/null; then \
 				cat ./helper/is-git-repo >> $(TEMPFILE); \
 			fi; \
 			tail -n +2 bin/$(COMMAND) >> $(TEMPFILE); \
diff --git a/need_git_repo b/not_need_git_repo
similarity index 54%
rename from need_git_repo
rename to not_need_git_repo
index 5f5e38880..d941c3c21 100644
--- a/need_git_repo
+++ b/not_need_git_repo
@@ -1,4 +1,4 @@
-# A list of the commands that use is_git_repo, and should have
+# A list of the commands that do not use is_git_repo(), and should not have
 # it included in the "built" version of the command
 git-alias
 git-extras

From 7ec7a186713e5ec19f019885ff66262f9ca7bc6c Mon Sep 17 00:00:00 2001
From: Jan Schulz <jasc@gmx.net>
Date: Tue, 5 Jan 2016 11:24:41 +0100
Subject: [PATCH 40/57] Update Installation.md

Update windows install instructions.
---
 Installation.md | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/Installation.md b/Installation.md
index f75c60285..9ceb1e8f4 100644
--- a/Installation.md
+++ b/Installation.md
@@ -15,6 +15,32 @@ $ sudo $apt_pref install git-extras
 $ brew install git-extras
 ```
 
+### Windows
+
+First, please install `Git for Windows 2.x` from 'https://github.com/git-for-windows/git/releases'.
+Second, clone the `git-extras` repo into any folder you like.
+```bash
+git clone https://github.com/tj/git-extras.git
+# checkout the latest tag (optional)
+git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
+```
+
+After that, execute the `install.cmd` in the command prompt, with the path your
+`Git for Windows 2.x` is installed. If you installed git as admin, you need to 
+run this promt as admin, too. Per default, it finds a `Git for Windows 2.x` in
+`%ProgramFiles%\Git`, which is the default install location. The fallback is
+`C:\SCM\PortableGit`. If you didn't install git into one of these dirs, you have 
+to supply the `mingw64` path for the install location, e.g. if git is installed 
+in `c:\git\`:
+
+```batch
+install.cmd "C:\git\mingw64"
+```
+
+Last, to use `git-line-summary`, `git-summary` and `git-ignore-io`, you need to copy 
+`column.exe` from a [msys2][1] installation from `folder-your-msys2-installed/usr/bin`
+to `folder-your-git-installed/usr/bin` .
+
 ## Building from source
 
 Obtain the git-extras source by cloning [its GitHub repo](https://github.com/tj/git-extras.git) or downloading a tarball of a [release](https://github.com/tj/git-extras/releases). Then install it by doing `make install` from the source tree.
@@ -62,28 +88,6 @@ If you installed git-extras with a package manager, use that package manager's t
 
 If you installed git-extras from source, you can run `git-extras update` to update it to the latest release. Be aware that this may lose any configuration options you specified during the original installation.
 
-## Windows (use it at your own risk)
-
-First, please install `Git for Windows 2.x` from 'https://github.com/git-for-windows/git/releases'
-and the basic [msys2][1].
-Second, clone the `git-extras` repo into any folder you like.
-```bash
-git clone https://github.com/tj/git-extras.git
-# checkout the latest tag (optional)
-git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
-```
-
-After that, execute the `install.cmd` in the command prompt, with the path your `Git for Windows 2.x` is installed.
-For example, I install it in the folder called `C:\SCM\PortableGit` and
-the `PREFIX` should be `C:\SCM\PortableGit\mingw64` (for 64-bit release)
-or `C:\SCM\PortableGit\mingw32` (for 32-bit release). So I will execute the `install.cmd` like this:
-```batch
-install.cmd "C:\SCM\PortableGit\mingw64"
-```
-
-Last, please copy `colrm.exe` and `column.exe` from `folder-your-msys2-installed/usr/bin` to
-`folder-your-git-installed/usr/bin`.
-
 Enjoy `git-extras`!
 
 [1]: http://sourceforge.net/projects/msys2/

From 672c87e9e478189e9002dceca0be553a3f8e72b7 Mon Sep 17 00:00:00 2001
From: Jan Schulz <jasc@gmx.net>
Date: Tue, 5 Jan 2016 14:36:17 +0100
Subject: [PATCH 41/57] Make the win installer more robust

User visible:
* Also accept the git install path (and not the mingw64 subdir) as a user
  supplied install location. Make it the new default and warn the user if
  a mingw64 dir is supplied (=this dir is not checked, so it might be
  anywhere...)
* Find git.exe in path and use that as an install location
* Add error|status messages and output less noise (robocopy)
* do some check if column.exe is not found...
* adjust the installation text for windows...

not user visible:
* more.exe does not work when used in a cmd which has a unicode codepage
  -> save the current codepage and set a sane default during the install
* do some "magic" with quotes around path variables -> makes it work with
  pathes with spaces in it (both final git dir and the git-extra checkout)
* Do not leak variables to the sourounding interpreter
---
 Installation.md |  20 ++++----
 install.cmd     | 127 ++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 121 insertions(+), 26 deletions(-)

diff --git a/Installation.md b/Installation.md
index 9ceb1e8f4..040230da4 100644
--- a/Installation.md
+++ b/Installation.md
@@ -25,21 +25,21 @@ git clone https://github.com/tj/git-extras.git
 git checkout $(git describe --tags $(git rev-list --tags --max-count=1))
 ```
 
-After that, execute the `install.cmd` in the command prompt, with the path your
-`Git for Windows 2.x` is installed. If you installed git as admin, you need to 
-run this promt as admin, too. Per default, it finds a `Git for Windows 2.x` in
-`%ProgramFiles%\Git`, which is the default install location. The fallback is
-`C:\SCM\PortableGit`. If you didn't install git into one of these dirs, you have 
-to supply the `mingw64` path for the install location, e.g. if git is installed 
-in `c:\git\`:
+After that, execute the `install.cmd` in the command prompt. If you installed
+git as admin, you need to run this prompt as admin, too. Per default, it finds
+a `Git for Windows 2.x` if it's in the path (first path in `where git.exe` wins)
+or installed in the default location `%ProgramFiles%\Git`. The fallback is
+`C:\SCM\PortableGit`. If you didn't install git into one of these dirs, you have
+to supply the path for the install location, e.g. if git is installed
+in `c:\git`:
 
 ```batch
-install.cmd "C:\git\mingw64"
+install.cmd "C:\git"
 ```
 
-Last, to use `git-line-summary`, `git-summary` and `git-ignore-io`, you need to copy 
+Last, to use `git line-summary`, `git summary` and `git ignore-io`, you need to copy
 `column.exe` from a [msys2][1] installation from `folder-your-msys2-installed/usr/bin`
-to `folder-your-git-installed/usr/bin` .
+to `folder-your-git-installed/usr/bin`.
 
 ## Building from source
 
diff --git a/install.cmd b/install.cmd
index 727b937d6..07541b008 100644
--- a/install.cmd
+++ b/install.cmd
@@ -1,32 +1,127 @@
 @ECHO OFF
+:: don't leak env variables into the calling interperter...
+setlocal
+:: better defaults for dealing with quotes...
+SETLOCAL enabledelayedexpansion
+
+:: A comment on quotes around file path variables:
+:: only add quotes around the variable when you use the variable
+:: as a file path (exists, type, pipe,...) and teh parenthesis of a 
+:: for, not when used as a string (-> setting variables)
+
+:: more does not work if the codepage is set to unicode 65001
+for /F "tokens=*" %%F in ('chcp') do (
+	for %%A in (%%F) do (set _last=%%A)
+)
+SET CP=%_last:~0,-1%
+chcp 850 > NUL
+:: echo %CP%
+
+:: not so sane default...
 SET PREFIX=C:\SCM\PortableGit\mingw64
+
+:: find a git.exe in path and use that as a default dir
+where /Q git.exe
+if errorlevel 1 goto :defaultpath
+
+for /F "delims=" %%F in ('where git.exe') do (
+	set bindir=%%~dpF
+	rem break after the first, so that we get the first in path
+	goto :break
+)
+goto :defaultpath
+
+:break
+rem remove the last slash
+SET bindir=%bindir:~0,-1%
+for %%G in ("%bindir%") do set installdir=%%~dpG
+set PREFIX=%installdir%mingw64
+goto :foundprefix
+
+:defaultpath
 :: default for Git for Windows 2.x
-@if exist "%ProgramFiles%\Git" (
-    set PREFIX="%ProgramFiles%\Git\mingw64"
+if exist "%ProgramFiles%\Git" (
+    set PREFIX=%ProgramFiles%\Git\mingw64
 )
-IF NOT "%~1"=="" SET PREFIX="%~1"
+
+:foundprefix
+:: overwrite with whatever the user supplied...
+IF NOT "%~1"=="" (
+	REM make it easier for the user to specify a prefix:
+	REM just supplying the git dir is enough...
+	if exist "%~1\mingw64" (
+		set PREFIX=%~1\mingw64
+	) else (
+		echo Using git install path "%~1" as PREFIX, please make sure it's really a
+		echo path to the mingw64 directory...
+		echo.
+		SET PREFIX=%~1
+	)
+)
+:: remove a trailing slash, but only after removing quotes...
+set PREFIX=!PREFIX:"=!
+IF %PREFIX:~-1%==\ SET PREFIX=%PREFIX:~0,-1%
+
+for %%H in ("%PREFIX%") do set GIT_INSTALL_DIR=%%~dpH
+
+set GIT_INSTALL_DIR=!GIT_INSTALL_DIR:"=!
+IF %GIT_INSTALL_DIR:~-1%==\ SET GIT_INSTALL_DIR=%GIT_INSTALL_DIR:~0,-1%
+
+if not exist "%GIT_INSTALL_DIR%\mingw64" (
+	echo No mingw64 folder found in %GIT_INSTALL_DIR%. 
+	echo.
+	echo Please supply a proper "Git for Windows 2.x" install path:
+	echo "install.cmd c:\[git-install-path]"
+	set ERROR=1
+	goto :exit
+)
+
+echo Installing to %PREFIX%
 SET HTMLDIR=%PREFIX%\share\doc\git-doc
 SET GITEXTRAS=%~dp0
 
-IF NOT EXIST %PREFIX%\bin MKDIR %PREFIX%\bin
+IF NOT EXIST "%PREFIX%\bin" MKDIR "%PREFIX%\bin"
 
 SET COMMANDS_WITHOUT_REPO=git-alias git-extras git-fork git-setup
 
-FOR /R %GITEXTRAS%\bin %%i in (*.*) DO (
-	ECHO #!/usr/bin/env bash > %PREFIX%\bin\%%~ni
-	TYPE %GITEXTRAS%\helper\reset-env >> %PREFIX%\bin\%%~ni
-	TYPE %GITEXTRAS%\helper\git-extra-utility >> %PREFIX%\bin\%%~ni
-	TYPE %GITEXTRAS%\helper\is-git-repo >> %PREFIX%\bin\%%~ni
-	MORE +2 %GITEXTRAS%\bin\%%~ni >> %PREFIX%\bin\%%~ni
+echo Installing binaries...
+FOR /R "%GITEXTRAS%\bin" %%i in (*.*) DO (
+	ECHO #!/usr/bin/env bash > "%PREFIX%\bin\%%~ni"
+	TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%~ni"
+	TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%~ni"
+	TYPE "%GITEXTRAS%\helper\is-git-repo" >> "%PREFIX%\bin\%%~ni"
+	MORE +2 "%GITEXTRAS%\bin\%%~ni" >> "%PREFIX%\bin\%%~ni"
 )
 
 FOR %%i in (%COMMANDS_WITHOUT_REPO%) DO (
-	ECHO #!/usr/bin/env bash > %PREFIX%\bin\%%i
-	TYPE %GITEXTRAS%\helper\reset-env >> %PREFIX%\bin\%%i
-	TYPE %GITEXTRAS%\helper\git-extra-utility >> %PREFIX%\bin\%%i
-	MORE +2 %GITEXTRAS%\bin\%%i >> %PREFIX%\bin\%%i
+	ECHO #!/usr/bin/env bash > "%PREFIX%\bin\%%i"
+	TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%i"
+	TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%i"
+	MORE +2 "%GITEXTRAS%\bin\%%i" >> "%PREFIX%\bin\%%i"
+)
+
+echo Installing man pages...
+set _QUIET=/NP /NFL /NDL /NJS /NJH
+ROBOCOPY %_QUIET% /IS "%GITEXTRAS%\man" "%HTMLDIR%" *.html
+echo done
+
+if not exist "%GIT_INSTALL_DIR%\usr\bin\column.exe" (
+	where /Q column.exe
+	if errorlevel 1 (
+		echo.
+		echo column.exe is missing: Not in "%GIT_INSTALL_DIR%\usr\bin" or in PATH!
+		echo.
+		echo "git summary", "git summary-line" and "git ignore-io" do not work
+		echo without. If you need these commands, please install msys2 and 
+		echo make column.exe available by copying it into the path or into 
+		echo "%GIT_INSTALL_DIR%\usr\bin".
+		echo.
+	)
 )
 
-ROBOCOPY /IS %GITEXTRAS%\man %HTMLDIR% *.html
 
-@ECHO ON
\ No newline at end of file
+:exit
+@chcp %CP% > NUL
+@endlocal enabledelayedexpansion
+@endlocal
+@exit /b %ERROR%

From a20d4bc890baefe49b06e4110c3c0f9018db700c Mon Sep 17 00:00:00 2001
From: Jan Schulz <jasc@gmx.net>
Date: Wed, 6 Jan 2016 15:38:46 +0100
Subject: [PATCH 42/57] install.cmd: properly escape the ! in the shebang line

This was a regression introduced by the useage of `enabledelayedexpansion`,
which results in `!` treated as variable identifier like `%`. The result
was that git didn't treat the scripts as git commands...
---
 install.cmd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/install.cmd b/install.cmd
index 07541b008..e39fb1db4 100644
--- a/install.cmd
+++ b/install.cmd
@@ -2,6 +2,7 @@
 :: don't leak env variables into the calling interperter...
 setlocal
 :: better defaults for dealing with quotes...
+:: You need to escape ! afterwards with ^^! or "^!"
 SETLOCAL enabledelayedexpansion
 
 :: A comment on quotes around file path variables:
@@ -86,7 +87,7 @@ SET COMMANDS_WITHOUT_REPO=git-alias git-extras git-fork git-setup
 
 echo Installing binaries...
 FOR /R "%GITEXTRAS%\bin" %%i in (*.*) DO (
-	ECHO #!/usr/bin/env bash > "%PREFIX%\bin\%%~ni"
+	ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%~ni"
 	TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%~ni"
 	TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%~ni"
 	TYPE "%GITEXTRAS%\helper\is-git-repo" >> "%PREFIX%\bin\%%~ni"
@@ -94,7 +95,7 @@ FOR /R "%GITEXTRAS%\bin" %%i in (*.*) DO (
 )
 
 FOR %%i in (%COMMANDS_WITHOUT_REPO%) DO (
-	ECHO #!/usr/bin/env bash > "%PREFIX%\bin\%%i"
+	ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%i"
 	TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%i"
 	TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%i"
 	MORE +2 "%GITEXTRAS%\bin\%%i" >> "%PREFIX%\bin\%%i"

From 6bf64fbb23510101811400499228592714874491 Mon Sep 17 00:00:00 2001
From: Jan Schulz <jasc@gmx.net>
Date: Wed, 6 Jan 2016 15:47:27 +0100
Subject: [PATCH 43/57] install.cmd: add a check for write rights to the
 install folder

This was happening earlier as well, but the error messages were the
raw messages from the failed writes...
---
 install.cmd | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/install.cmd b/install.cmd
index e39fb1db4..984441be3 100644
--- a/install.cmd
+++ b/install.cmd
@@ -7,7 +7,7 @@ SETLOCAL enabledelayedexpansion
 
 :: A comment on quotes around file path variables:
 :: only add quotes around the variable when you use the variable
-:: as a file path (exists, type, pipe,...) and teh parenthesis of a 
+:: as a file path (exists, type, pipe,...) and the parenthesis of a
 :: for, not when used as a string (-> setting variables)
 
 :: more does not work if the codepage is set to unicode 65001
@@ -69,7 +69,7 @@ set GIT_INSTALL_DIR=!GIT_INSTALL_DIR:"=!
 IF %GIT_INSTALL_DIR:~-1%==\ SET GIT_INSTALL_DIR=%GIT_INSTALL_DIR:~0,-1%
 
 if not exist "%GIT_INSTALL_DIR%\mingw64" (
-	echo No mingw64 folder found in %GIT_INSTALL_DIR%. 
+	echo No mingw64 folder found in %GIT_INSTALL_DIR%.
 	echo.
 	echo Please supply a proper "Git for Windows 2.x" install path:
 	echo "install.cmd c:\[git-install-path]"
@@ -83,6 +83,24 @@ SET GITEXTRAS=%~dp0
 
 IF NOT EXIST "%PREFIX%\bin" MKDIR "%PREFIX%\bin"
 
+:: Check that we can install into that dir or need admin rights...
+set _testfile=%PREFIX%\bin\testfile_to_check_if_dir_is_writeable-577423947123.~
+copy NUL "%_testfile%" >NUL 2>&1
+IF EXIST "%_testfile%" (
+    set IS_WRITEABLE=yes
+    del "%_testfile%"
+) else (
+    set IS_WRITEABLE=no
+)
+if "%IS_WRITEABLE%"=="no" (
+    echo.
+    echo Directory for binaries ["%PREFIX%\bin"] is not writeable by install.cmd.
+    echo.
+    echo You probably need to run install.cmd from an admin prompt.
+    set ERROR=1
+    goto :exit
+)
+
 SET COMMANDS_WITHOUT_REPO=git-alias git-extras git-fork git-setup
 
 echo Installing binaries...
@@ -104,6 +122,13 @@ FOR %%i in (%COMMANDS_WITHOUT_REPO%) DO (
 echo Installing man pages...
 set _QUIET=/NP /NFL /NDL /NJS /NJH
 ROBOCOPY %_QUIET% /IS "%GITEXTRAS%\man" "%HTMLDIR%" *.html
+IF %ERRORLEVEL% GTR 7 (
+    echo Not all html docs could be copied to "%GITEXTRAS%\man".
+    echo.
+    echo You probably need to run the install.cmd script from an admin prompt.
+    set ERROR=1
+    goto :exit
+)
 echo done
 
 if not exist "%GIT_INSTALL_DIR%\usr\bin\column.exe" (

From 64f9e4d797b42c17dfead8b5e721fee78c0d44b0 Mon Sep 17 00:00:00 2001
From: Jan Schulz <jasc@gmx.net>
Date: Wed, 6 Jan 2016 15:49:57 +0100
Subject: [PATCH 44/57] installation.md: Update information about column.exe

column.exe will be available in the next git release:
https://github.com/git-for-windows/build-extra/pull/92

Also convert tabs to spaces... Was mixed up to now :-/
---
 Installation.md |  2 +-
 install.cmd     | 78 ++++++++++++++++++++++++-------------------------
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/Installation.md b/Installation.md
index 040230da4..1be393ae2 100644
--- a/Installation.md
+++ b/Installation.md
@@ -39,7 +39,7 @@ install.cmd "C:\git"
 
 Last, to use `git line-summary`, `git summary` and `git ignore-io`, you need to copy
 `column.exe` from a [msys2][1] installation from `folder-your-msys2-installed/usr/bin`
-to `folder-your-git-installed/usr/bin`.
+to `folder-your-git-installed/usr/bin` or wait for git 2.7.1, which will include column.exe.
 
 ## Building from source
 
diff --git a/install.cmd b/install.cmd
index 984441be3..ac674cfe8 100644
--- a/install.cmd
+++ b/install.cmd
@@ -12,7 +12,7 @@ SETLOCAL enabledelayedexpansion
 
 :: more does not work if the codepage is set to unicode 65001
 for /F "tokens=*" %%F in ('chcp') do (
-	for %%A in (%%F) do (set _last=%%A)
+    for %%A in (%%F) do (set _last=%%A)
 )
 SET CP=%_last:~0,-1%
 chcp 850 > NUL
@@ -26,9 +26,9 @@ where /Q git.exe
 if errorlevel 1 goto :defaultpath
 
 for /F "delims=" %%F in ('where git.exe') do (
-	set bindir=%%~dpF
-	rem break after the first, so that we get the first in path
-	goto :break
+    set bindir=%%~dpF
+    rem break after the first, so that we get the first in path
+    goto :break
 )
 goto :defaultpath
 
@@ -48,16 +48,16 @@ if exist "%ProgramFiles%\Git" (
 :foundprefix
 :: overwrite with whatever the user supplied...
 IF NOT "%~1"=="" (
-	REM make it easier for the user to specify a prefix:
-	REM just supplying the git dir is enough...
-	if exist "%~1\mingw64" (
-		set PREFIX=%~1\mingw64
-	) else (
-		echo Using git install path "%~1" as PREFIX, please make sure it's really a
-		echo path to the mingw64 directory...
-		echo.
-		SET PREFIX=%~1
-	)
+    REM make it easier for the user to specify a prefix:
+    REM just supplying the git dir is enough...
+    if exist "%~1\mingw64" (
+        set PREFIX=%~1\mingw64
+    ) else (
+        echo Using git install path "%~1" as PREFIX, please make sure it's really a
+        echo path to the mingw64 directory...
+        echo.
+        SET PREFIX=%~1
+    )
 )
 :: remove a trailing slash, but only after removing quotes...
 set PREFIX=!PREFIX:"=!
@@ -69,12 +69,12 @@ set GIT_INSTALL_DIR=!GIT_INSTALL_DIR:"=!
 IF %GIT_INSTALL_DIR:~-1%==\ SET GIT_INSTALL_DIR=%GIT_INSTALL_DIR:~0,-1%
 
 if not exist "%GIT_INSTALL_DIR%\mingw64" (
-	echo No mingw64 folder found in %GIT_INSTALL_DIR%.
-	echo.
-	echo Please supply a proper "Git for Windows 2.x" install path:
-	echo "install.cmd c:\[git-install-path]"
-	set ERROR=1
-	goto :exit
+    echo No mingw64 folder found in %GIT_INSTALL_DIR%.
+    echo.
+    echo Please supply a proper "Git for Windows 2.x" install path:
+    echo "install.cmd c:\[git-install-path]"
+    set ERROR=1
+    goto :exit
 )
 
 echo Installing to %PREFIX%
@@ -105,18 +105,18 @@ SET COMMANDS_WITHOUT_REPO=git-alias git-extras git-fork git-setup
 
 echo Installing binaries...
 FOR /R "%GITEXTRAS%\bin" %%i in (*.*) DO (
-	ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%~ni"
-	TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%~ni"
-	TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%~ni"
-	TYPE "%GITEXTRAS%\helper\is-git-repo" >> "%PREFIX%\bin\%%~ni"
-	MORE +2 "%GITEXTRAS%\bin\%%~ni" >> "%PREFIX%\bin\%%~ni"
+    ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%~ni"
+    TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%~ni"
+    TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%~ni"
+    TYPE "%GITEXTRAS%\helper\is-git-repo" >> "%PREFIX%\bin\%%~ni"
+    MORE +2 "%GITEXTRAS%\bin\%%~ni" >> "%PREFIX%\bin\%%~ni"
 )
 
 FOR %%i in (%COMMANDS_WITHOUT_REPO%) DO (
-	ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%i"
-	TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%i"
-	TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%i"
-	MORE +2 "%GITEXTRAS%\bin\%%i" >> "%PREFIX%\bin\%%i"
+    ECHO #^^!/usr/bin/env bash > "%PREFIX%\bin\%%i"
+    TYPE "%GITEXTRAS%\helper\reset-env" >> "%PREFIX%\bin\%%i"
+    TYPE "%GITEXTRAS%\helper\git-extra-utility" >> "%PREFIX%\bin\%%i"
+    MORE +2 "%GITEXTRAS%\bin\%%i" >> "%PREFIX%\bin\%%i"
 )
 
 echo Installing man pages...
@@ -132,17 +132,15 @@ IF %ERRORLEVEL% GTR 7 (
 echo done
 
 if not exist "%GIT_INSTALL_DIR%\usr\bin\column.exe" (
-	where /Q column.exe
-	if errorlevel 1 (
-		echo.
-		echo column.exe is missing: Not in "%GIT_INSTALL_DIR%\usr\bin" or in PATH!
-		echo.
-		echo "git summary", "git summary-line" and "git ignore-io" do not work
-		echo without. If you need these commands, please install msys2 and 
-		echo make column.exe available by copying it into the path or into 
-		echo "%GIT_INSTALL_DIR%\usr\bin".
-		echo.
-	)
+    where /Q column.exe
+    if errorlevel 1 (
+        echo.
+        echo column.exe is missing: Not in "%GIT_INSTALL_DIR%\usr\bin" or in PATH!
+        echo.
+        echo "git summary", "git summary-line" and "git ignore-io" do not work without.
+        echo If you need these commands, please install Git for Windows > 2.7.0.
+        echo.
+    )
 )
 
 

From e6398ba24f88379411490b3ec2ce7be9a3164d7b Mon Sep 17 00:00:00 2001
From: Nimit Kalra <me@nimit.io>
Date: Sat, 9 Jan 2016 18:03:19 -0600
Subject: [PATCH 45/57] Add BSD installation instructions.

Fixes #498.
---
 Installation.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Installation.md b/Installation.md
index 040230da4..001361b80 100644
--- a/Installation.md
+++ b/Installation.md
@@ -41,6 +41,10 @@ Last, to use `git line-summary`, `git summary` and `git ignore-io`, you need to
 `column.exe` from a [msys2][1] installation from `folder-your-msys2-installed/usr/bin`
 to `folder-your-git-installed/usr/bin`.
 
+### BSD
+
+Use the instructions to build from source below. Make sure you are using `gmake` (GNU `make`) instead of `make`.
+
 ## Building from source
 
 Obtain the git-extras source by cloning [its GitHub repo](https://github.com/tj/git-extras.git) or downloading a tarball of a [release](https://github.com/tj/git-extras/releases). Then install it by doing `make install` from the source tree.

From 12e416a324bb08dfa5c72dee8aa5b4dcfb6ea53e Mon Sep 17 00:00:00 2001
From: Takuma Yamaguchi <kumon0587@gmail.com>
Date: Thu, 14 Jan 2016 00:19:12 +0900
Subject: [PATCH 46/57] add git-sync

---
 Commands.md       |  10 ++++
 bin/git-sync      |  61 +++++++++++++++++++++++++
 man/git-sync.1    |  35 ++++++++++++++
 man/git-sync.html | 113 ++++++++++++++++++++++++++++++++++++++++++++++
 man/git-sync.md   |  30 ++++++++++++
 5 files changed, 249 insertions(+)
 create mode 100755 bin/git-sync
 create mode 100644 man/git-sync.1
 create mode 100644 man/git-sync.html
 create mode 100644 man/git-sync.md

diff --git a/Commands.md b/Commands.md
index a294dbdd0..ab899f0d0 100644
--- a/Commands.md
+++ b/Commands.md
@@ -43,6 +43,7 @@
  - [`git setup`](#git-setup)
  - [`git squash`](#git-squash)
  - [`git summary`](#git-summary)
+ - [`git sync`](#git-sync)
  - [`git touch`](#git-touch)
  - [`git undo`](#git-undo)
  - [`git unlock`](#git-unlock)
@@ -987,3 +988,12 @@ $ git psykorebase master feature
 ```
 
 The above rebase `feature` branch on top of `master` branch
+
+## git sync
+
+Sync local branch with remote branch
+
+```bash
+$ git sync origin master
+```
+
diff --git a/bin/git-sync b/bin/git-sync
new file mode 100755
index 000000000..765f19a78
--- /dev/null
+++ b/bin/git-sync
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+function _usage()
+{
+  local command="git sync"
+  cat << EOS
+Usage:
+  ${command} <remote> <branch>
+  ${command} -h | --help | help | ?
+
+Sync local branch with <branch> of <remote>.
+All changes and untracked files and directories will be removed.
+
+Example:
+  ${command} origin master
+EOS
+}
+
+function main()
+{
+  while [ "$1" != "" ]; do
+    case $1 in
+      -h | --help | help | "?" )
+        _usage
+        ;;
+      * )
+        if [ "${remote}" = "" ]; then
+          local remote="$1"
+        elif [ "${branch}" = "" ]; then
+          local branch="$1"
+        else
+          echo -e "Error: too many arguments.\n"
+          _usage
+          exit 1
+        fi
+        ;;
+    esac
+    shift
+  done
+
+  if [ "${remote}" = "" -o "${branch}" = "" ]; then
+     echo -e "Error: too few arguments.\n"
+     _usage
+     exit 1
+  fi
+
+  echo "Are you sure you want to clean all changes & sync with '${remote}/${branch}'? [y/N]"
+  local res
+  read res
+  case ${res} in
+    "Y" | "y" | "yes" | "Yes" | "YES" )
+      git fetch '${remote}' && git reset --hard '${remote}'/'${branch}' && git clean -d -f -x
+      ;;
+    * )
+      echo "Canceled."
+      ;;
+  esac
+}
+
+main "$@"
+
diff --git a/man/git-sync.1 b/man/git-sync.1
new file mode 100644
index 000000000..90a4954ee
--- /dev/null
+++ b/man/git-sync.1
@@ -0,0 +1,35 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GIT\-SYNC" "1" "January 2016" "" ""
+.
+.SH "NAME"
+\fBgit\-sync\fR \- Sync local branch with remote branch
+.
+.SH "SYNOPSIS"
+\fBgit sync\fR <remote> <branch>
+.
+.SH "DESCRIPTION"
+Sync local branch with <branch> of <remote>\. All changes and untracked files and directories will be removed\.
+.
+.SH "EXAMPLES"
+Sync local branch with origin/master
+.
+.IP "" 4
+.
+.nf
+
+$ git sync origin master
+.
+.fi
+.
+.IP "" 0
+.
+.SH "AUTHOR"
+Written by Takuma Yamaguchi <\fIkumon0587@gmail\.com\fR>
+.
+.SH "REPORTING BUGS"
+<\fIhttps://github\.com/tj/git\-extras/issues\fR>
+.
+.SH "SEE ALSO"
+<\fIhttps://github\.com/tj/git\-extras\fR>
diff --git a/man/git-sync.html b/man/git-sync.html
new file mode 100644
index 000000000..05a5c1f6f
--- /dev/null
+++ b/man/git-sync.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' value='text/html;charset=utf8'>
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>git-sync(1) - Sync local branch with remote branch</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#REPORTING-BUGS">REPORTING BUGS</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>git-sync(1)</li>
+    <li class='tc'></li>
+    <li class='tr'>git-sync(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>git-sync</code> - <span class="man-whatis">Sync local branch with remote branch</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p>  <code>git sync</code> &lt;remote&gt; &lt;branch&gt;</p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>  Sync local branch with &lt;branch&gt; of &lt;remote&gt;.
+  All changes and untracked files and directories will be removed.</p>
+
+<h2 id="EXAMPLES">EXAMPLES</h2>
+
+<p>  Sync local branch with origin/master</p>
+
+<pre><code>$ git sync origin master
+</code></pre>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>Written by Takuma Yamaguchi &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#58;&#107;&#x75;&#109;&#111;&#x6e;&#x30;&#53;&#56;&#55;&#64;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#107;&#117;&#x6d;&#x6f;&#110;&#x30;&#53;&#x38;&#55;&#64;&#x67;&#109;&#97;&#x69;&#108;&#x2e;&#99;&#x6f;&#x6d;</a>&gt;</p>
+
+<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
+
+<p>&lt;<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>&gt;</p>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;</p>
+
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'></li>
+    <li class='tc'>January 2016</li>
+    <li class='tr'>git-sync(1)</li>
+  </ol>
+
+  </div>
+</body>
+</html>
diff --git a/man/git-sync.md b/man/git-sync.md
new file mode 100644
index 000000000..885463498
--- /dev/null
+++ b/man/git-sync.md
@@ -0,0 +1,30 @@
+git-sync(1) -- Sync local branch with remote branch
+=================================================================
+
+## SYNOPSIS
+
+  `git sync` &lt;remote&gt; &lt;branch&gt;
+
+## DESCRIPTION
+
+  Sync local branch with &lt;branch&gt; of &lt;remote&gt;.
+  All changes and untracked files and directories will be removed.
+
+## EXAMPLES
+
+  Sync local branch with origin/master
+
+    $ git sync origin master
+
+## AUTHOR
+
+Written by Takuma Yamaguchi &lt;<kumon0587@gmail.com>&gt;
+
+## REPORTING BUGS
+
+&lt;<https://github.com/tj/git-extras/issues>&gt;
+
+## SEE ALSO
+
+&lt;<https://github.com/tj/git-extras>&gt;
+

From 3481ff245ecf99dd283b75d70b68e05684ceeee3 Mon Sep 17 00:00:00 2001
From: Takuma Yamaguchi <kumon0587@gmail.com>
Date: Sat, 16 Jan 2016 01:40:10 +0900
Subject: [PATCH 47/57] upstream is used by default

---
 bin/git-sync      | 38 +++++++++++++++++++++++++-------------
 man/git-sync.1    | 23 +++++++++++++++++++++--
 man/git-sync.html | 16 ++++++++++++----
 man/git-sync.md   | 12 +++++++++---
 4 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/bin/git-sync b/bin/git-sync
index 765f19a78..cbb684599 100755
--- a/bin/git-sync
+++ b/bin/git-sync
@@ -5,14 +5,19 @@ function _usage()
   local command="git sync"
   cat << EOS
 Usage:
-  ${command} <remote> <branch>
-  ${command} -h | --help | help | ?
+  ${command} [<remote> <branch>]
+  ${command} -h | --help
 
-Sync local branch with <branch> of <remote>.
+Sync local branch with <remote>/<branch>.
+When <remote> and <branch> are not specified on the command line, upstream of local branch will be used by default.
 All changes and untracked files and directories will be removed.
 
-Example:
-  ${command} origin master
+Examples:
+  Sync with upstream of local branch:
+    ${command}
+
+  Sync with origin/master:
+    ${command} origin master
 EOS
 }
 
@@ -20,8 +25,9 @@ function main()
 {
   while [ "$1" != "" ]; do
     case $1 in
-      -h | --help | help | "?" )
+      -h | --help)
         _usage
+        exit
         ;;
       * )
         if [ "${remote}" = "" ]; then
@@ -38,18 +44,24 @@ function main()
     shift
   done
 
-  if [ "${remote}" = "" -o "${branch}" = "" ]; then
-     echo -e "Error: too few arguments.\n"
-     _usage
-     exit 1
+  if [ "${remote}" = "" ]; then
+    local remote_branch="$(git rev-parse --abbrev-ref --symbolic-full-name @{u})"
+    branch="$(git rev-parse --abbrev-ref --symbolic-full-name @)"
+    remote="${remote_branch%%/${branch}}"
+  elif [ "${branch}" = "" ]; then
+    echo -e "Error: too few arguments.\n"
+    _usage
+    exit 1
+  else
+    local remote_branch="${remote}/${branch}"
   fi
 
-  echo "Are you sure you want to clean all changes & sync with '${remote}/${branch}'? [y/N]"
+  echo "Are you sure you want to clean all changes & sync with '${remote_branch}'? [y/N]"
   local res
   read res
-  case ${res} in
+  case "${res}" in
     "Y" | "y" | "yes" | "Yes" | "YES" )
-      git fetch '${remote}' && git reset --hard '${remote}'/'${branch}' && git clean -d -f -x
+      echo "git fetch "${remote}" "${branch}" && git reset --hard "${remote_branch}" && git clean -d -f -x"
       ;;
     * )
       echo "Canceled."
diff --git a/man/git-sync.1 b/man/git-sync.1
index 90a4954ee..498b2f217 100644
--- a/man/git-sync.1
+++ b/man/git-sync.1
@@ -7,12 +7,31 @@
 \fBgit\-sync\fR \- Sync local branch with remote branch
 .
 .SH "SYNOPSIS"
-\fBgit sync\fR <remote> <branch>
+\fBgit sync\fR [ <remote> <branch> ]
 .
 .SH "DESCRIPTION"
-Sync local branch with <branch> of <remote>\. All changes and untracked files and directories will be removed\.
+Sync local branch with <remote>/<branch>\.
+.
+.P
+When <remote> and <branch> are not specified on the command line, upstream of local branch will be used by default\.
+.
+.P
+All changes and untracked files and directories will be removed\.
 .
 .SH "EXAMPLES"
+Sync local branch with its upstream
+.
+.IP "" 4
+.
+.nf
+
+$ git sync
+.
+.fi
+.
+.IP "" 0
+.
+.P
 Sync local branch with origin/master
 .
 .IP "" 4
diff --git a/man/git-sync.html b/man/git-sync.html
index 05a5c1f6f..234cdb0ac 100644
--- a/man/git-sync.html
+++ b/man/git-sync.html
@@ -75,15 +75,23 @@ <h2 id="NAME">NAME</h2>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p>  <code>git sync</code> &lt;remote&gt; &lt;branch&gt;</p>
+<p>  <code>git sync</code> [ &lt;remote&gt; &lt;branch&gt; ]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>  Sync local branch with &lt;branch&gt; of &lt;remote&gt;.
-  All changes and untracked files and directories will be removed.</p>
+<p>  Sync local branch with &lt;remote&gt;/&lt;branch&gt;.</p>
+
+<p>  When &lt;remote&gt; and &lt;branch&gt; are not specified on the command line, upstream of local branch will be used by default.</p>
+
+<p>  All changes and untracked files and directories will be removed.</p>
 
 <h2 id="EXAMPLES">EXAMPLES</h2>
 
+<p>  Sync local branch with its upstream</p>
+
+<pre><code>$ git sync
+</code></pre>
+
 <p>  Sync local branch with origin/master</p>
 
 <pre><code>$ git sync origin master
@@ -91,7 +99,7 @@ <h2 id="EXAMPLES">EXAMPLES</h2>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Takuma Yamaguchi &lt;<a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#58;&#107;&#x75;&#109;&#111;&#x6e;&#x30;&#53;&#56;&#55;&#64;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#99;&#x6f;&#109;" data-bare-link="true">&#107;&#117;&#x6d;&#x6f;&#110;&#x30;&#53;&#x38;&#55;&#64;&#x67;&#109;&#97;&#x69;&#108;&#x2e;&#99;&#x6f;&#x6d;</a>&gt;</p>
+<p>Written by Takuma Yamaguchi &lt;<a href="&#x6d;&#97;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#107;&#x75;&#109;&#x6f;&#x6e;&#x30;&#53;&#56;&#55;&#64;&#x67;&#x6d;&#97;&#105;&#108;&#x2e;&#99;&#111;&#109;" data-bare-link="true">&#107;&#117;&#109;&#x6f;&#110;&#48;&#x35;&#x38;&#x37;&#64;&#103;&#109;&#97;&#105;&#108;&#x2e;&#x63;&#111;&#x6d;</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
diff --git a/man/git-sync.md b/man/git-sync.md
index 885463498..f2f6e431e 100644
--- a/man/git-sync.md
+++ b/man/git-sync.md
@@ -3,15 +3,22 @@ git-sync(1) -- Sync local branch with remote branch
 
 ## SYNOPSIS
 
-  `git sync` &lt;remote&gt; &lt;branch&gt;
+  `git sync` [ &lt;remote&gt; &lt;branch&gt; ]
 
 ## DESCRIPTION
 
-  Sync local branch with &lt;branch&gt; of &lt;remote&gt;.
+  Sync local branch with &lt;remote&gt;/&lt;branch&gt;.
+  
+  When &lt;remote&gt; and &lt;branch&gt; are not specified on the command line, upstream of local branch will be used by default.
+  
   All changes and untracked files and directories will be removed.
 
 ## EXAMPLES
 
+  Sync local branch with its upstream
+
+    $ git sync
+
   Sync local branch with origin/master
 
     $ git sync origin master
@@ -27,4 +34,3 @@ Written by Takuma Yamaguchi &lt;<kumon0587@gmail.com>&gt;
 ## SEE ALSO
 
 &lt;<https://github.com/tj/git-extras>&gt;
-

From 19ece6192e21612642e7fbdbf6c4c7beb946bd0a Mon Sep 17 00:00:00 2001
From: Takuma Yamaguchi <kumon0587@gmail.com>
Date: Sat, 16 Jan 2016 01:47:30 +0900
Subject: [PATCH 48/57] add example of git-sync

---
 Commands.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Commands.md b/Commands.md
index ab899f0d0..6fd1cbc5d 100644
--- a/Commands.md
+++ b/Commands.md
@@ -991,7 +991,13 @@ The above rebase `feature` branch on top of `master` branch
 
 ## git sync
 
-Sync local branch with remote branch
+Sync local branch with its remote branch
+
+```bash
+$ git sync
+```
+
+Sync local branch with origin/master
 
 ```bash
 $ git sync origin master

From f0ecd8212922b83975aff78e61bf0f21273061c1 Mon Sep 17 00:00:00 2001
From: Takuma Yamaguchi <kumon0587@gmail.com>
Date: Sun, 17 Jan 2016 00:56:45 +0900
Subject: [PATCH 49/57] add upstream check & bugfix

---
 bin/git-sync | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/git-sync b/bin/git-sync
index cbb684599..8de036aec 100755
--- a/bin/git-sync
+++ b/bin/git-sync
@@ -44,16 +44,20 @@ function main()
     shift
   done
 
+  local remote_branch
   if [ "${remote}" = "" ]; then
-    local remote_branch="$(git rev-parse --abbrev-ref --symbolic-full-name @{u})"
-    branch="$(git rev-parse --abbrev-ref --symbolic-full-name @)"
-    remote="${remote_branch%%/${branch}}"
+    if ! remote_branch="$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null)"; then
+      echo "There is no upstream information of local branch."
+      exit 1
+    fi
+    local branch="$(git rev-parse --abbrev-ref --symbolic-full-name @)"
+    local remote=$(git config "branch.${branch}.remote")
   elif [ "${branch}" = "" ]; then
     echo -e "Error: too few arguments.\n"
     _usage
     exit 1
   else
-    local remote_branch="${remote}/${branch}"
+    remote_branch="${remote}/${branch}"
   fi
 
   echo "Are you sure you want to clean all changes & sync with '${remote_branch}'? [y/N]"
@@ -61,7 +65,7 @@ function main()
   read res
   case "${res}" in
     "Y" | "y" | "yes" | "Yes" | "YES" )
-      echo "git fetch "${remote}" "${branch}" && git reset --hard "${remote_branch}" && git clean -d -f -x"
+      git fetch "${remote}" "${branch}" && git reset --hard "${remote_branch}" && git clean -d -f -x
       ;;
     * )
       echo "Canceled."

From afce25cd650dfccdf70057691e2db6378242102b Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Wed, 20 Jan 2016 11:39:25 +0800
Subject: [PATCH 50/57] use ps -f and awk to emulate pgrep

There is no pgrep in git for windows
---
 bin/git-changelog | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/bin/git-changelog b/bin/git-changelog
index dc27a8b1d..bb01b7a9d 100755
--- a/bin/git-changelog
+++ b/bin/git-changelog
@@ -317,7 +317,20 @@ _exit() {
   stty sane; echo; echo "caught signal, shutting down"
 
   IFS=$'\n'
-    pid_list=( $(pgrep -P $$) )
+  # The format of `ps` is different between Windows and other platforms,
+  # so we need to calculate the total column number(COL_NUM) of header first.
+  # Why don't we just use the last column?
+  # Because the body of CMD column may contain space and be treated as multiple fileds.
+  pid_list=( $(ps -f | 
+    awk -v ppid=$$ 'NR == 1 {
+      COL_NUM = NF
+    }
+    $3 == ppid {
+      # filter out temp processes created in this subshell
+      if ($COL_NUM != "ps" && $COL_NUM != "awk" && $COL_NUM !~ "bash$")
+        print $2
+    }')
+  )
   IFS="$defaultIFS"
 
   local _pid

From a192fe688ac65450602cba72850050889236476d Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Wed, 20 Jan 2016 11:39:39 +0800
Subject: [PATCH 51/57] handle GIT_EDITOR which contains space

---
 bin/git-changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/git-changelog b/bin/git-changelog
index bb01b7a9d..80cecf96b 100755
--- a/bin/git-changelog
+++ b/bin/git-changelog
@@ -478,7 +478,10 @@ main() {
     rm -f "$tmpfile"
   else
     cp -f "$tmpfile" "$changelog"
-    [[ -n "$GIT_EDITOR" ]] && $GIT_EDITOR "$changelog"
+    # Use `eval` to handle GIT_EDITOR which contains space and options,
+    # like ""C:\Program Files (x86)\Notepad++\notepad++.exe" -multiInst ".
+    # Thanks @JanSchulz to inspire me this solution
+    [[ -n "$GIT_EDITOR" ]] && eval $GIT_EDITOR "$changelog"
     if [[ $? -ne 0 ]]; then
       _exit
     fi

From 0fde295f5ee1c8edb709e504da47dc8b329c5a08 Mon Sep 17 00:00:00 2001
From: "Rico Sta. Cruz" <rstacruz@users.noreply.github.com>
Date: Fri, 22 Jan 2016 18:01:28 +0800
Subject: [PATCH 52/57] Update git PR manual to mention URLs

---
 man/git-pr.1    |  30 +++++++++-
 man/git-pr.html | 143 ------------------------------------------------
 man/git-pr.md   |  19 ++++++-
 3 files changed, 44 insertions(+), 148 deletions(-)

diff --git a/man/git-pr.1 b/man/git-pr.1
index 0c62df08b..a7df50972 100644
--- a/man/git-pr.1
+++ b/man/git-pr.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-PR" "1" "December 2015" "" ""
+.TH "GIT\-PR" "1" "January 2016" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-pr\fR \- Checks out a pull request locally
@@ -10,10 +10,13 @@
 \fBgit\-pr\fR <number> [<remote>]
 .
 .br
+\fBgit\-pr\fR <url>
+.
+.br
 \fBgit\-pr clean\fR
 .
 .SH "DESCRIPTION"
-Creates a local branch based on a GitHub pull request number, and switch to that branch afterwards\.
+Creates a local branch based on a GitHub pull request number or URL, and switch to that branch afterwards\.
 .
 .SH "OPTIONS"
 <remote>
@@ -21,6 +24,12 @@ Creates a local branch based on a GitHub pull request number, and switch to that
 .P
 The name of the remote to fetch from\. Defaults to \fBorigin\fR\.
 .
+.P
+<url>
+.
+.P
+GitHub pull request URL in the format \fBhttps://github\.com/tj/git\-extras/pull/453\fR\.
+.
 .SH "EXAMPLES"
 This checks out the pull request \fB226\fR from \fBorigin\fR:
 .
@@ -57,6 +66,23 @@ $ git pr 226 upstream
 .IP "" 0
 .
 .P
+You can also checkout a pull request based on a GitHub URL:
+.
+.IP "" 4
+.
+.nf
+
+$ git pr https://github\.com/tj/git\-extras/pull/453
+
+From https://github\.com/tj/git\-extras
+ * [new ref]         refs/pull/453/head \-> pr/453
+Switched to branch \'pr/453\'
+.
+.fi
+.
+.IP "" 0
+.
+.P
 To clean up old branches:
 .
 .IP "" 4
diff --git a/man/git-pr.html b/man/git-pr.html
index 40406135c..e69de29bb 100644
--- a/man/git-pr.html
+++ b/man/git-pr.html
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv='content-type' value='text/html;charset=utf8'>
-  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
-  <title>git-pr(1) - Checks out a pull request locally</title>
-  <style type='text/css' media='all'>
-  /* style: man */
-  body#manpage {margin:0}
-  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
-  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
-  .mp h2 {margin:10px 0 0 0}
-  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
-  .mp h3 {margin:0 0 0 4ex}
-  .mp dt {margin:0;clear:left}
-  .mp dt.flush {float:left;width:8ex}
-  .mp dd {margin:0 0 0 9ex}
-  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
-  .mp pre {margin-bottom:20px}
-  .mp pre+h2,.mp pre+h3 {margin-top:22px}
-  .mp h2+pre,.mp h3+pre {margin-top:5px}
-  .mp img {display:block;margin:auto}
-  .mp h1.man-title {display:none}
-  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
-  .mp h2 {font-size:16px;line-height:1.25}
-  .mp h1 {font-size:20px;line-height:2}
-  .mp {text-align:justify;background:#fff}
-  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
-  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
-  .mp u {text-decoration:underline}
-  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
-  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
-  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
-  .mp b.man-ref {font-weight:normal;color:#434241}
-  .mp pre {padding:0 4ex}
-  .mp pre code {font-weight:normal;color:#434241}
-  .mp h2+pre,h3+pre {padding-left:0}
-  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
-  ol.man-decor {width:100%}
-  ol.man-decor li.tl {text-align:left}
-  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
-  ol.man-decor li.tr {text-align:right;float:right}
-  </style>
-</head>
-<!--
-  The following styles are deprecated and will be removed at some point:
-  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
-
-  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
-  .man-navigation should be used instead.
--->
-<body id='manpage'>
-  <div class='mp' id='man'>
-
-  <div class='man-navigation' style='display:none'>
-    <a href="#NAME">NAME</a>
-    <a href="#SYNOPSIS">SYNOPSIS</a>
-    <a href="#DESCRIPTION">DESCRIPTION</a>
-    <a href="#OPTIONS">OPTIONS</a>
-    <a href="#EXAMPLES">EXAMPLES</a>
-    <a href="#AUTHOR">AUTHOR</a>
-    <a href="#REPORTING-BUGS">REPORTING BUGS</a>
-    <a href="#SEE-ALSO">SEE ALSO</a>
-  </div>
-
-  <ol class='man-decor man-head man head'>
-    <li class='tl'>git-pr(1)</li>
-    <li class='tc'></li>
-    <li class='tr'>git-pr(1)</li>
-  </ol>
-
-  <h2 id="NAME">NAME</h2>
-<p class="man-name">
-  <code>git-pr</code> - <span class="man-whatis">Checks out a pull request locally</span>
-</p>
-
-<h2 id="SYNOPSIS">SYNOPSIS</h2>
-
-<p><code>git-pr</code> &lt;number&gt; [&lt;remote&gt;]<br />
-<code>git-pr clean</code></p>
-
-<h2 id="DESCRIPTION">DESCRIPTION</h2>
-
-<p>  Creates a local branch based on a GitHub pull request number, and switch to
-  that branch afterwards.</p>
-
-<h2 id="OPTIONS">OPTIONS</h2>
-
-<p>  &lt;remote&gt;</p>
-
-<p>  The name of the remote to fetch from. Defaults to <code>origin</code>.</p>
-
-<h2 id="EXAMPLES">EXAMPLES</h2>
-
-<p>This checks out the pull request <code>226</code> from <code>origin</code>:</p>
-
-<pre><code>$ git pr 226
-
-remote: Counting objects: 12, done.
-remote: Compressing objects: 100% (9/9), done.
-remote: Total 12 (delta 3), reused 9 (delta 3)
-Unpacking objects: 100% (12/12), done.
-From https://github.com/tj/git-extras
- * [new ref]         refs/pull/226/head -&gt; pr/226
-
-Switched to branch 'pr/226'
-</code></pre>
-
-<p>This pulls from a different remote:</p>
-
-<pre><code>$ git pr 226 upstream
-</code></pre>
-
-<p>To clean up old branches:</p>
-
-<pre><code>$ git pr clean
-
-Deleted branch pr/226 (was b96a8c2).
-Deleted branch pr/220 (was d34dc0f).
-</code></pre>
-
-<h2 id="AUTHOR">AUTHOR</h2>
-
-<p>Originally from https://gist.github.com/gnarf/5406589</p>
-
-<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
-
-<p>&lt;<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>&gt;</p>
-
-<h2 id="SEE-ALSO">SEE ALSO</h2>
-
-<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;</p>
-
-
-  <ol class='man-decor man-foot man foot'>
-    <li class='tl'></li>
-    <li class='tc'>December 2015</li>
-    <li class='tr'>git-pr(1)</li>
-  </ol>
-
-  </div>
-</body>
-</html>
diff --git a/man/git-pr.md b/man/git-pr.md
index 9d774eea6..93c6fd0c9 100644
--- a/man/git-pr.md
+++ b/man/git-pr.md
@@ -4,19 +4,24 @@ git-pr(1) -- Checks out a pull request locally
 ## SYNOPSIS
 
 `git-pr` &lt;number&gt; [&lt;remote&gt;]<br>
+`git-pr` &lt;url&gt;<br>
 `git-pr clean`
 
 ## DESCRIPTION
 
-  Creates a local branch based on a GitHub pull request number, and switch to 
-  that branch afterwards.
+  Creates a local branch based on a GitHub pull request number or URL, and
+  switch to that branch afterwards.
 
 ## OPTIONS
-  
+
   &lt;remote&gt;
 
   The name of the remote to fetch from. Defaults to `origin`.
 
+  &lt;url&gt;
+
+  GitHub pull request URL in the format `https://github.com/tj/git-extras/pull/453`.
+
 ## EXAMPLES
 
 This checks out the pull request `226` from `origin`:
@@ -36,6 +41,14 @@ This pulls from a different remote:
 
     $ git pr 226 upstream
 
+You can also checkout a pull request based on a GitHub URL:
+
+    $ git pr https://github.com/tj/git-extras/pull/453
+
+    From https://github.com/tj/git-extras
+     * [new ref]         refs/pull/453/head -> pr/453
+    Switched to branch 'pr/453'
+
 To clean up old branches:
 
     $ git pr clean

From 9d2df44d18d6b8989fb3feb5d4de02716d40c56d Mon Sep 17 00:00:00 2001
From: "Rico Sta. Cruz" <rstacruz@users.noreply.github.com>
Date: Fri, 22 Jan 2016 20:51:36 +0800
Subject: [PATCH 53/57] Regerenate git-pr.html

---
 man/git-pr.html | 157 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/man/git-pr.html b/man/git-pr.html
index e69de29bb..a6a436542 100644
--- a/man/git-pr.html
+++ b/man/git-pr.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' value='text/html;charset=utf8'>
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>git-pr(1) - Checks out a pull request locally</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#AUTHOR">AUTHOR</a>
+    <a href="#REPORTING-BUGS">REPORTING BUGS</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>git-pr(1)</li>
+    <li class='tc'>Git Extras</li>
+    <li class='tr'>git-pr(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>git-pr</code> - <span class="man-whatis">Checks out a pull request locally</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p><code>git-pr</code> &lt;number&gt; [&lt;remote&gt;]<br />
+<code>git-pr</code> &lt;url&gt;<br />
+<code>git-pr clean</code></p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>  Creates a local branch based on a GitHub pull request number or URL, and
+  switch to that branch afterwards.</p>
+
+<h2 id="OPTIONS">OPTIONS</h2>
+
+<p>  &lt;remote&gt;</p>
+
+<p>  The name of the remote to fetch from. Defaults to <code>origin</code>.</p>
+
+<p>  &lt;url&gt;</p>
+
+<p>  GitHub pull request URL in the format <code>https://github.com/tj/git-extras/pull/453</code>.</p>
+
+<h2 id="EXAMPLES">EXAMPLES</h2>
+
+<p>This checks out the pull request <code>226</code> from <code>origin</code>:</p>
+
+<pre><code>$ git pr 226
+
+remote: Counting objects: 12, done.
+remote: Compressing objects: 100% (9/9), done.
+remote: Total 12 (delta 3), reused 9 (delta 3)
+Unpacking objects: 100% (12/12), done.
+From https://github.com/tj/git-extras
+ * [new ref]         refs/pull/226/head -&gt; pr/226
+
+Switched to branch 'pr/226'
+</code></pre>
+
+<p>This pulls from a different remote:</p>
+
+<pre><code>$ git pr 226 upstream
+</code></pre>
+
+<p>You can also checkout a pull request based on a GitHub URL:</p>
+
+<pre><code>$ git pr https://github.com/tj/git-extras/pull/453
+
+From https://github.com/tj/git-extras
+ * [new ref]         refs/pull/453/head -&gt; pr/453
+Switched to branch 'pr/453'
+</code></pre>
+
+<p>To clean up old branches:</p>
+
+<pre><code>$ git pr clean
+
+Deleted branch pr/226 (was b96a8c2).
+Deleted branch pr/220 (was d34dc0f).
+</code></pre>
+
+<h2 id="AUTHOR">AUTHOR</h2>
+
+<p>Originally from https://gist.github.com/gnarf/5406589</p>
+
+<h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
+
+<p>&lt;<a href="https://github.com/tj/git-extras/issues" data-bare-link="true">https://github.com/tj/git-extras/issues</a>&gt;</p>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p>&lt;<a href="https://github.com/tj/git-extras" data-bare-link="true">https://github.com/tj/git-extras</a>&gt;</p>
+
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'></li>
+    <li class='tc'>January 2016</li>
+    <li class='tr'>git-pr(1)</li>
+  </ol>
+
+  </div>
+</body>
+</html>

From 0ca4c6f2215ea021c7508dd67bf5c2cb45b77e10 Mon Sep 17 00:00:00 2001
From: Nimit Kalra <me@nimit.io>
Date: Sun, 24 Jan 2016 15:03:50 -0600
Subject: [PATCH 54/57] Version 4.1.0

---
 AUTHORS        | 138 ++++++++++++++++++++++++-------------------------
 History.md     |  30 +++++++++++
 bin/git-extras |   2 +-
 3 files changed, 100 insertions(+), 70 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e261b6078..e11ca6505 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,127 +22,127 @@ Patches and Suggestions
 - Mark Eissler <mark@mixtur.com>
 - Leila Muhtasib <muhtasib@gmail.com>
 - Jesús Espino <jesus.espino@kaleidos.net>
-- Kenneth Reitz <me@kennethreitz.com>
+- Jan Schulz <jasc@gmx.net>
 - David Baumgold <david@davidbaumgold.com>
-- Sasha Khamkov <sanusart@gmail.com>
 - Andrew Janke <andrew@apjanke.net>
-- Chris Hall <christopher.k.hall@gmail.com>
+- Kenneth Reitz <me@kennethreitz.com>
+- Sasha Khamkov <sanusart@gmail.com>
+- Damian Krzeminski <dkrzemin@gmail.com>
+- Aggelos Orfanakos <agorf@agorf.gr>
 - grindhold <grindhold@gmx.net>
 - Camille Reynders <camille.reynders@ibbt.be>
-- Damian Krzeminski <dkrzemin@gmail.com>
 - NANRI <southly@gmail.com>
-- Aggelos Orfanakos <agorf@agorf.gr>
+- Chris Hall <christopher.k.hall@gmail.com>
 - Phally <info@frankdegraaf.net>
 - Rémy HUBSCHER <rhubscher@mozilla.com>
+- Rico Sta. Cruz <rstacruz@users.noreply.github.com>
 - Alexander Krasnukhin <the.malkolm@gmail.com>
+- Takuma Yamaguchi <kumon0587@gmail.com>
 - gisphm <phmfk@hotmail.com>
-- Jan Schulz <jasc@gmx.net>
-- Jonathan "Duke" Leto <jonathan@leto.net>
 - wooorm <tituswormer@gmail.com>
-- Brian J Brennan <brianloveswords@gmail.com>
-- Ivan Malopinsky <ivan@imsky.org>
-- Nimit Kalra <me@nimit.io>
 - Philipp Klose <me@thehippo.de>
+- Jonathan "Duke" Leto <jonathan@leto.net>
 - Nils Winkler <nils@nilswinkler.com>
+- Ivan Malopinsky <ivan@imsky.org>
 - Julio Napurí <julionc@gmail.com>
 - Hogan Long <hoganlong@gmail.com>
-- Domenico Rotiroti <drotiro@tiscali.it>
-- Alexis GRIMALDI <alexis.grimaldi@gmail.com>
-- Andre Cerqueira <me@andrecerqueira.com>
-- Curtis McEnroe <programble@gmail.com>
-- Devin Withers <dwithers@kionix.com>
-- Evan Grim <evan@mirgnave.com>
-- Florian H <jscoderr@gmail.com>
+- Brian J Brennan <brianloveswords@gmail.com>
 - Gert Van Gool <gertvangool@gmail.com>
-- Guillaume Seren <guillaumeseren@gmail.com>
-- Jean Jordaan <jean.jordaan@gmail.com>
-- Justin Guenther <jguenther@gmail.com>
-- Kylie McClain <somasissounds@gmail.com>
-- Marc Harter <wavded@gmail.com>
+- Curtis McEnroe <programble@gmail.com>
 - Nate Jones <nate@endot.org>
 - Newell Zhu <zlx.star@gmail.com>
 - Patryk Małek <malekpatryk@gmail.com>
 - Paul Schreiber <paul.schreiber@espn.com>
+- Andre Cerqueira <me@andrecerqueira.com>
 - Richard Littauer <richard.littauer@gmail.com>
-- Rico Sta. Cruz <rstacruz@users.noreply.github.com>
+- Jean Jordaan <jean.jordaan@gmail.com>
+- Alexis GRIMALDI <alexis.grimaldi@gmail.com>
+- David Rogers <hello@al-the-x.me>
+- Devin Withers <dwithers@kionix.com>
 - Tom Vincent <git@tlvince.com>
+- Domenico Rotiroti <drotiro@tiscali.it>
 - Wil Moore III <wil.moore@wilmoore.com>
+- Justin Guenther <jguenther@gmail.com>
 - go2null <1t1is2@gmail.com>
+- Evan Grim <evan@mirgnave.com>
+- Kylie McClain <somasissounds@gmail.com>
 - luozexuan <zexuan.lzx@alibaba-inc.com>
+- Florian H <jscoderr@gmail.com>
+- Guillaume Seren <guillaumeseren@gmail.com>
 - phigoro <phigoro@users.noreply.github.com>
 - soffolk <lianxin.zhu@easyread.ly>
-- Joshua Appelman <jappelman@xebia.com>
+- Marc Harter <wavded@gmail.com>
+- Xiaopei Li <toksea@gmail.com>
+- creynders <camille.reynders@gmail.com>
+- dead-horse <dead_horse@qq.com>
+- eszabpt <peter.szabados@ericsson.com>
 - jykntr <jykntr@gmail.com>
+- meza <meza@meza.hu>
+- neydroid <joseneyguerrero@gmail.com>
+- nulltask <nulltask@gmail.com>
+- zeroDivisible <zerodivisible@gmail.com>
 - Adam Parkin <aparkin@seekersolutions.com>
+- ☃ pitr <pitr.vern@gmail.com>
+- Akim Demaille <akim@lrde.epita.fr>
+- Alex McHale <alexmchale@gmail.com>
+- Allan Odgaard <github@simplit.com>
+- Amir Tocker <tocker.signup@gmail.com>
+- Andrei Petcu <andreicristianpetcu@gmail.com>
+- Andrew Starr-Bochicchio <a.starr.b@gmail.com>
+- Andy <mail@andrewgriffithsonline.com>
+- Antoine Beaupré <anarcat@koumbit.org>
+- Aurélien Scoubeau <aurelien.scoubeau@gmail.com>
+- Balazs Nadasdi <yitsushi@gmail.com>
+- Ben Parnell <benjaminparnell.94@gmail.com>
+- Brandon Zylstra <brandon.zylstra@gmail.com>
+- Bruno Sutic <bruno.sutic@gmail.com>
+- Carl Casbolt <carl.casbolt@gmail.com>
+- Ciro Nunes <ciroanunes@gmail.com>
+- Craig MacGregor <craigerm@gmail.com>
+- Dan Jackson <e28eta@yahoo.com>
+- Daniel Schildt <daniel@autiomaa.org>
+- Dave James Miller <dave@davejamesmiller.com>
+- David Hartmann <dh@thesilverlogic.com>
+- Dung Quang <nxqd.inbox+rhacker@gmail.com>
+- Emil Kjelsrud <emilkje@gmail.com>
+- Greg Allen <me@jga.me>
+- Guillermo Rauch <rauchg@gmail.com>
+- Gunnlaugur Thor Briem <gunnlaugur@gmail.com>
+- James Manning <james.manning@gmail.com>
+- Jan Krueger <jan278@googlemail.com>
+- Jarod Stewart <StewartJarod@users.noreply.github.com>
+- Jason Young <a.young.jason@gmail.com>
+- Jens K. Mueller <jkm@gluey.org>
+- Jesse Sipprell <jsipprell@mcclatchyinteractive.com>
+- Jianjin Fan <fanjianjin@xiaomi.com>
+- Johannes Ewald <johannes.ewald@peerigon.com>
+- John Hoffmann <jhoffmann@sugarcrm.com>
+- Jon Ander Peñalba <jonander.penalba@ticketbis.com>
+- Joshua Appelman <jappelman@xebia.com>
 - Kevin Woo <kevinawoo@gmail.com>
 - Konstantin Schukraft <konstantin@schukraft.org>
-- Akim Demaille <akim@lrde.epita.fr>
 - Leandro López <inkel.ar@gmail.com>
-- David Hartmann <dh@thesilverlogic.com>
-- Dave James Miller <dave@davejamesmiller.com>
 - Maarten Winter <mw@one.com>
-- meza <meza@meza.hu>
-- Daniel Schildt <daniel@autiomaa.org>
 - Mathieu D. (MatToufoutu) <mattoufootu@gmail.com>
 - Matt Colyer <matt@colyer.name>
 - Matthew Avant <mavant@palantir.com>
 - Michael Komitee <mkomitee@gmail.com>
 - Michael Matuzak <michael@lambdaphant.com>
 - Moritz Grauel <mo@notadomain.com>
-- Dan Jackson <e28eta@yahoo.com>
-- neydroid <joseneyguerrero@gmail.com>
 - Nathan Rajlich <nathan@tootallnate.net>
-- Amir Tocker <tocker.signup@gmail.com>
 - Nick Campbell <ncampbell@siteworx.com>
 - Nick Payne <nick@kurai.co.uk>
-- Craig MacGregor <craigerm@gmail.com>
 - Niklas Fiekas <niklas.fiekas@googlemail.com>
-- Ciro Nunes <ciroanunes@gmail.com>
-- Carl Casbolt <carl.casbolt@gmail.com>
-- nulltask <nulltask@gmail.com>
-- Bruno Sutic <bruno.sutic@gmail.com>
-- Brandon Zylstra <brandon.zylstra@gmail.com>
 - Raphael Fleischlin <raphael.fleischlin@gmail.com>
 - Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
 - Riceball LEE <snowyu.lee@gmail.com>
-- zeroDivisible <zerodivisible@gmail.com>
-- ☃ pitr <pitr.vern@gmail.com>
 - Rob Kennedy <kennedyri@gmail.com>
 - Ryan Bohn <rbohn@biohitech.com>
-- Ben Parnell <benjaminparnell.94@gmail.com>
 - Sam Thursfield <sam.thursfield@codethink.co.uk>
-- Balazs Nadasdi <yitsushi@gmail.com>
 - Stephen Mathieson <smath23@gmail.com>
 - Steve Mao <maochenyan@gmail.com>
-- Aurélien Scoubeau <aurelien.scoubeau@gmail.com>
-- Antoine Beaupré <anarcat@koumbit.org>
 - Todd Wolfson <todd@twolfson.com>
 - Tony <zearin@gonk.net>
 - TweeKane <tweekane@gmail.com>
 - Valérian Galliat <val@codejam.info>
-- Allan Odgaard <github@simplit.com>
-- Xiaopei Li <toksea@gmail.com>
-- creynders <camille.reynders@gmail.com>
-- dead-horse <dead_horse@qq.com>
-- eszabpt <peter.szabados@ericsson.com>
-- Andy <mail@andrewgriffithsonline.com>
-- Alex McHale <alexmchale@gmail.com>
-- Andrew Starr-Bochicchio <a.starr.b@gmail.com>
-- Jan Krueger <jan278@googlemail.com>
-- James Manning <james.manning@gmail.com>
-- Jarod Stewart <StewartJarod@users.noreply.github.com>
-- Jason Young <a.young.jason@gmail.com>
-- Andrei Petcu <andreicristianpetcu@gmail.com>
-- Jens K. Mueller <jkm@gluey.org>
-- Jesse Sipprell <jsipprell@mcclatchyinteractive.com>
-- Gunnlaugur Thor Briem <gunnlaugur@gmail.com>
-- Jianjin Fan <fanjianjin@xiaomi.com>
-- Johannes Ewald <johannes.ewald@peerigon.com>
-- John Hoffmann <jhoffmann@sugarcrm.com>
-- Jon Ander Peñalba <jonander.penalba@ticketbis.com>
-- Guillermo Rauch <rauchg@gmail.com>
-- Greg Allen <me@jga.me>
-- Emil Kjelsrud <emilkje@gmail.com>
-- Dung Quang <nxqd.inbox+rhacker@gmail.com>
-- David Rogers <hello@al-the-x.me>
 - Duane Johnson
diff --git a/History.md b/History.md
index f8fc90b84..2beae7b85 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,34 @@
 
+4.1.0 / 2016-01-25
+==================
+
+  * Merge pull request #503 from spacewander/fix_502
+  * Merge pull request #507 from rstacruz/git-pr-manual
+  * Regerenate git-pr.html
+  * Merge pull request #506 from rstacruz/git-pr-manual
+  * Update git PR manual to mention URLs
+  * handle GIT_EDITOR which contains space
+  * use ps -f and awk to emulate pgrep
+  * Merge pull request #500 from kumon/master
+  * add upstream check & bugfix
+  * add example of git-sync
+  * upstream is used by default
+  * Merge pull request #497 from JanSchulz/win_inst2
+  * add git-sync
+  * Merge pull request #499 from tj/add-bsd-installation
+  * Add BSD installation instructions.
+  * installation.md: Update information about column.exe
+  * install.cmd: add a check for write rights to the install folder
+  * install.cmd: properly escape the ! in the shebang line
+  * Merge pull request #496 from JanSchulz/win_inst
+  * Make the win installer more robust
+  * Merge pull request #494 from apjanke/fix-git-repo-inclusion
+  * Merge pull request #495 from JanSchulz/patch-1
+  * Update Installation.md
+  * Makefile: fix inverted list of commands that use is_git_repo
+  * Add Gitter badge.
+  * Bump version to 4.1.0-dev.
+
 4.0.0 / 2015-12-28
 ==================
 
diff --git a/bin/git-extras b/bin/git-extras
index be1c25ede..45103dfcc 100755
--- a/bin/git-extras
+++ b/bin/git-extras
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="4.1.0-dev"
+VERSION="4.1.0"
 INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh"
 
 update() {

From 8a8a483f41133165e0afe8f4f79ad9fbdadf10f2 Mon Sep 17 00:00:00 2001
From: Nimit Kalra <me@nimit.io>
Date: Sun, 24 Jan 2016 15:07:09 -0600
Subject: [PATCH 55/57] Bump version to 4.2.0-dev.

---
 bin/git-extras | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/git-extras b/bin/git-extras
index 45103dfcc..c2b44a5cb 100755
--- a/bin/git-extras
+++ b/bin/git-extras
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="4.1.0"
+VERSION="4.2.0-dev"
 INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh"
 
 update() {

From 511c135e2f8c37a3c2f5ad24445b472f0cef8765 Mon Sep 17 00:00:00 2001
From: George Crabtree <supercrabtree@googlemail.com>
Date: Thu, 28 Jan 2016 22:17:36 +1100
Subject: [PATCH 56/57] Fix typo in git-clear documentation

---
 Commands.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Commands.md b/Commands.md
index 6fd1cbc5d..f7c0071ad 100644
--- a/Commands.md
+++ b/Commands.md
@@ -946,7 +946,7 @@ Makefile
 README.md
 ```
 
-## git-clear
+## git clear
 
 Does a hard reset and deletes all untracked files from the working directory
 

From d286839da1054c04675e2a3dc90baf8caf253b63 Mon Sep 17 00:00:00 2001
From: Prayag Verma <prayag.verma@gmail.com>
Date: Sat, 30 Jan 2016 17:30:04 +0530
Subject: [PATCH 57/57] Mention initial copyright year and add contributors to
 copyright

I am not a lawyer but according to http://www.copyright.gov/circs/circ01.pdf (See screenshot of relevant section below), mentioning the first year of publication in the copyright is a good thing

![selection_008](https://cloud.githubusercontent.com/assets/829526/12409934/7021c3a6-be95-11e5-8d1a-18f6948571e0.png)

Mentioning 2010 as the first release happened at that time - https://github.com/tj/git-extras/releases/tag/0.0.1

Also adding `Contributors` to copyright because TJ Holowaychuk is not the only person owning copyright for the whole project. The copyright is collectively owned by all contributors, or more precisely: every contributor owns a copyright on the code he or she has contributed.

The only way to retain full copyright over code is to ask for signing contributor's agreement before merging in changes. This is, in fact, what some companies who license commercially their free software do.
---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index f1c86e1a6..86c4a2974 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2015 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2010 TJ Holowaychuk <tj@vision-media.ca> and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the