diff --git a/Readme.md b/Readme.md
index eea4872ab..c5bd6d7c2 100644
--- a/Readme.md
+++ b/Readme.md
@@ -23,3 +23,12 @@ __GIT utilities__ -- repo summary, repl, changelog population, author commit per
 Interested in contributing? Awesome!
 
 Please read [Contributing](CONTRIBUTING.md) before you make a PR, thanks!
+
+## The change of the default branch
+
+As of Git Extras 6.4 the assumed default branch name changed from `master` to `main`.
+This affects the Git Extras commands `git archive-file`, `git delete-merged-branches`, `git delta`, `git pull-request`, `git show-merged-branches`, `git show-unmerged-branches` and `git squash`.
+
+To change the default branch name to `master`: change either the configuration `git-extras.default-branch` or `init.defaultBranch` to `master`, the former takes precedence.
+
+For example, `git config git-extras.default-branch master`
diff --git a/helper/git-extra-utility b/helper/git-extra-utility
index fcbd6843c..166d074f9 100755
--- a/helper/git-extra-utility
+++ b/helper/git-extra-utility
@@ -6,11 +6,14 @@ git_extra_mktemp() {
 }
 
 git_extra_default_branch() {
-    local default_branch
-    default_branch=$(git config --get git-extras.default-branch)
-    if [ -z "$default_branch" ]; then
-        echo "master"
+    local extras_default_branch init_default_branch
+    extras_default_branch=$(git config --get git-extras.default-branch)
+    init_default_branch=$(git config --get init.defaultBranch)
+    if [ -n "$extras_default_branch" ]; then
+        echo "$extras_default_branch"
+    elif [ -n "$init_default_branch" ]; then
+        echo "$init_default_branch"
     else
-        echo "$default_branch"
+        echo "main"
     fi
 }
diff --git a/man/git-extras.1 b/man/git-extras.1
index 8394ef3ab..957f18851 100644
--- a/man/git-extras.1
+++ b/man/git-extras.1
@@ -1,245 +1,171 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "GIT\-EXTRAS" "1" "October 2020" "" "Git Extras"
-.
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "GIT\-EXTRAS" "1" "December 2021" "" "Git Extras"
 .SH "NAME"
 \fBgit\-extras\fR \- Awesome GIT utilities
-.
 .SH "SYNOPSIS"
 \fBgit\-extras\fR [\-v,\-\-version] [\-h,\-\-help] [update]
-.
 .SH "OPTIONS"
 \-v, \-\-version
-.
 .P
 Show git\-extras version number\.
-.
 .P
 \-h, \-\-help
-.
 .P
 Show this help\. This option can also be used for any of the extras commands\.
-.
 .P
 update
-.
 .P
 Self update\.
-.
 .SH "ENVIRONMENT AND CONFIGURATION VARIABLES"
 \fBgit config \-\-add git\-extras\.default\-branch $BRANCH\fR
-.
 .P
-Change the default branch to \fB$BRANCH\fR (defaut to \fBmaster\fR)\.
-.
+Change the default branch to \fB$BRANCH\fR\. If \fBgit\-extras\.default\-branch\fR isn\'t set, \fBinit\.defaultBranch\fR is used instead\. If none of them are set it defaults to \fBmain\fR\.
 .SH "COMMANDS"
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
+\fBgit\-abort(1)\fR Abort current git operation
+.IP "\[ci]" 4
 \fBgit\-alias(1)\fR Define, search and show aliases
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-archive\-file(1)\fR Export the current HEAD of the git repository to an archive
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-authors(1)\fR Generate authors report
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-browse(1)\fR \fIView the web page for the current repository\fR
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-brv(1)\fR List branches sorted by their last commit date
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-bulk(1)\fR Run git commands on multiple repositories
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-changelog(1)\fR Generate a changelog report
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-clear\-soft(1)\fR Soft clean up a repository
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-clear(1)\fR Rigorously clean up a repository
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-coauthor(1)\fR Add a co\-author to the last commit
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-commits\-since(1)\fR Show commit logs since some date
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-contrib(1)\fR Show user\'s contributions
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-count(1)\fR Show commit count
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-cp(1)\fR Copy a file keeping its history
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-create\-branch(1)\fR Create branches
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-delete\-branch(1)\fR Delete branches
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-delete\-merged\-branches(1)\fR Delete merged branches
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
+\fBgit\-delete\-squashed\-branches(1)\fR Delete branches that were squashed
+.IP "\[ci]" 4
 \fBgit\-delete\-submodule(1)\fR Delete submodules
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-delete\-tag(1)\fR Delete tags
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-delta(1)\fR Lists changed files
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-effort(1)\fR Show effort statistics on file(s)
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-feature(1)\fR Create/Merge feature branch
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-force\-clone(1)\fR overwrite local repositories with clone
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-fork(1)\fR Fork a repo on github
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-fresh\-branch(1)\fR Create fresh branches
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-gh\-pages(1)\fR Create the GitHub Pages branch
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-graft(1)\fR Merge and destroy a given branch
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-guilt(1)\fR calculate change between two revisions
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-ignore\-io(1)\fR Get sample gitignore file
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-ignore(1)\fR Add \.gitignore patterns
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-info(1)\fR Returns information on current repository
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-local\-commits(1)\fR List local commits
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-lock(1)\fR Lock a file excluded from version control
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-locked(1)\fR ls files that have been locked
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
+\fBgit\-magic(1)\fR Automate add/commit/push routines
+.IP "\[ci]" 4
 \fBgit\-merge\-into(1)\fR Merge one branch into another
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-merge\-repo(1)\fR Merge two repo histories
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-missing(1)\fR Show commits missing from another branch
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-mr(1)\fR Checks out a merge request locally
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-obliterate(1)\fR rewrite past commits to remove some files
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-paste(1)\fR Send patches to pastebin for chat conversations
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-pr(1)\fR Checks out a pull request locally
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-psykorebase(1)\fR Rebase a branch with a merge commit
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-pull\-request(1)\fR Create pull request for GitHub project
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-reauthor(1)\fR Rewrite history to change author\'s identity
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-rebase\-patch(1)\fR Rebases a patch
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-release(1)\fR Commit, tag and push changes to the repository
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-rename\-branch(1)\fR rename local branch and push to remote
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-rename\-remote(1)\fR Rename a remote
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-rename\-tag(1)\fR Rename a tag
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-repl(1)\fR git read\-eval\-print\-loop
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-reset\-file(1)\fR Reset one file
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-root(1)\fR show path of root
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-scp(1)\fR Copy files to SSH compatible \fBgit\-remote\fR
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-sed(1)\fR replace patterns in git\-controlled files
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-setup(1)\fR Set up a git repository
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-show\-merged\-branches(1)\fR Show merged branches
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-show\-tree(1)\fR show branch tree of commit history
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-show\-unmerged\-branches(1)\fR Show unmerged branches
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-squash(1)\fR squash N last changes up to a ref\'ed commit
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-stamp(1)\fR Stamp the last commit message
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-standup(1)\fR Recall the commit history
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-summary(1)\fR Show repository summary
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-sync(1)\fR Sync local branch with remote branch
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-touch(1)\fR Touch and add file to the index
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-undo(1)\fR Remove latest commits
-.
-.IP "\(bu" 4
+.IP "\[ci]" 4
 \fBgit\-unlock(1)\fR Unlock a file excluded from version control
-.
+.IP "\[ci]" 4
+\fBgit\-utimes(1)\fR Change files modification time to their last commit date
 .IP "" 0
-.
 .SH "AUTHOR"
 Written by Tj Holowaychuk <\fItj@vision\-media\.ca\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-extras.html b/man/git-extras.html
index 28e2231ce..09da1a48f 100644
--- a/man/git-extras.html
+++ b/man/git-extras.html
@@ -1,8 +1,8 @@
 <!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)'>
+  <meta http-equiv='content-type' content='text/html;charset=utf8'>
+  <meta name='generator' content='Ronn-NG/v0.9.1 (http://github.com/apjanke/ronn-ng/tree/0.9.1)'>
   <title>git-extras(1) - Awesome GIT utilities</title>
   <style type='text/css' media='all'>
   /* style: man */
@@ -69,110 +69,186 @@
     <li class='tr'>git-extras(1)</li>
   </ol>
 
-  <h2 id="NAME">NAME</h2>
+  
+
+<h2 id="NAME">NAME</h2>
 <p class="man-name">
   <code>git-extras</code> - <span class="man-whatis">Awesome GIT utilities</span>
 </p>
-
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <p><code>git-extras</code> [-v,--version] [-h,--help] [update]</p>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
-<p>  -v, --version</p>
+<p>-v, --version</p>
 
-<p>  Show git-extras version number.</p>
+<p>Show git-extras version number.</p>
 
-<p>  -h, --help</p>
+<p>-h, --help</p>
 
-<p>  Show this help. This option can also be used for any of the extras commands.</p>
+<p>Show this help. This option can also be used for any of the extras commands.</p>
 
-<p>  update</p>
+<p>update</p>
 
-<p>  Self update.</p>
+<p>Self update.</p>
 
 <h2 id="ENVIRONMENT-AND-CONFIGURATION-VARIABLES">ENVIRONMENT AND CONFIGURATION VARIABLES</h2>
 
-<p>  <code>git config --add git-extras.default-branch $BRANCH</code></p>
+<p><code>git config --add git-extras.default-branch $BRANCH</code></p>
 
-<p>  Change the default branch to <code>$BRANCH</code> (defaut to <code>master</code>).</p>
+<p>Change the default branch to <code>$BRANCH</code>. If <code>git-extras.default-branch</code> isn't set, <code>init.defaultBranch</code> is used instead. If none of them are set it defaults to <code>main</code>.</p>
 
 <h2 id="COMMANDS">COMMANDS</h2>
 
 <ul>
-<li> <strong><a class="man-ref" href="git-alias.html">git-alias<span class="s">(1)</span></a></strong> Define, search and show aliases</li>
-<li> <strong><a class="man-ref" href="git-archive-file.html">git-archive-file<span class="s">(1)</span></a></strong> Export the current HEAD of the git repository to an archive</li>
-<li> <strong><a class="man-ref" href="git-authors.html">git-authors<span class="s">(1)</span></a></strong> Generate authors report</li>
-<li> <strong><a class="man-ref" href="git-browse.html">git-browse<span class="s">(1)</span></a></strong> <var>View the web page for the current repository</var></li>
-<li> <strong><a class="man-ref" href="git-brv.html">git-brv<span class="s">(1)</span></a></strong> List branches sorted by their last commit date</li>
-<li> <strong><a class="man-ref" href="git-bulk.html">git-bulk<span class="s">(1)</span></a></strong> Run git commands on multiple repositories</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-clear-soft.html">git-clear-soft<span class="s">(1)</span></a></strong> Soft clean up a repository</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-coauthor.html">git-coauthor<span class="s">(1)</span></a></strong> Add a co-author to the last commit</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>
-<li> <strong><a class="man-ref" href="git-cp.html">git-cp<span class="s">(1)</span></a></strong> Copy a file keeping its history</li>
-<li> <strong><a class="man-ref" href="git-create-branch.html">git-create-branch<span class="s">(1)</span></a></strong> Create branches</li>
-<li> <strong><a class="man-ref" href="git-delete-branch.html">git-delete-branch<span class="s">(1)</span></a></strong> Delete branches</li>
-<li> <strong><a class="man-ref" href="git-delete-merged-branches.html">git-delete-merged-branches<span class="s">(1)</span></a></strong> Delete merged branches</li>
-<li> <strong><a class="man-ref" href="git-delete-submodule.html">git-delete-submodule<span class="s">(1)</span></a></strong> Delete submodules</li>
-<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/Merge feature branch</li>
-<li> <strong><a class="man-ref" href="git-force-clone.html">git-force-clone<span class="s">(1)</span></a></strong> overwrite local repositories with clone</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-local-commits.html">git-local-commits<span class="s">(1)</span></a></strong> List local commits</li>
-<li> <strong><a class="man-ref" href="git-lock.html">git-lock<span class="s">(1)</span></a></strong> Lock a file excluded from version control</li>
-<li> <strong><a class="man-ref" href="git-locked.html">git-locked<span class="s">(1)</span></a></strong> ls files that have been locked</li>
-<li> <strong><a class="man-ref" href="git-merge-into.html">git-merge-into<span class="s">(1)</span></a></strong> Merge one branch into another</li>
-<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-mr.html">git-mr<span class="s">(1)</span></a></strong> Checks out a merge request locally</li>
-<li> <strong><a class="man-ref" href="git-obliterate.html">git-obliterate<span class="s">(1)</span></a></strong> rewrite past commits to remove some files</li>
-<li> <strong><a class="man-ref" href="git-paste.html">git-paste<span class="s">(1)</span></a></strong> Send patches to pastebin for chat conversations</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-pull-request.html">git-pull-request<span class="s">(1)</span></a></strong> Create pull request for GitHub project</li>
-<li> <strong><a class="man-ref" href="git-reauthor.html">git-reauthor<span class="s">(1)</span></a></strong> Rewrite history to change author's identity</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-release.html">git-release<span class="s">(1)</span></a></strong> Commit, tag and push changes to the repository</li>
-<li> <strong><a class="man-ref" href="git-rename-branch.html">git-rename-branch<span class="s">(1)</span></a></strong> rename local branch and push to remote</li>
-<li> <strong><a class="man-ref" href="git-rename-remote.html">git-rename-remote<span class="s">(1)</span></a></strong> Rename a remote</li>
-<li> <strong><a class="man-ref" href="git-rename-tag.html">git-rename-tag<span class="s">(1)</span></a></strong> Rename a tag</li>
-<li> <strong><a class="man-ref" href="git-repl.html">git-repl<span class="s">(1)</span></a></strong> git read-eval-print-loop</li>
-<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>
-<li> <strong><a class="man-ref" href="git-show-unmerged-branches.html">git-show-unmerged-branches<span class="s">(1)</span></a></strong> Show unmerged branches</li>
-<li> <strong><a class="man-ref" href="git-squash.html">git-squash<span class="s">(1)</span></a></strong> squash N last changes up to a ref'ed commit</li>
-<li> <strong><a class="man-ref" href="git-stamp.html">git-stamp<span class="s">(1)</span></a></strong> Stamp the last commit message</li>
-<li> <strong><a class="man-ref" href="git-standup.html">git-standup<span class="s">(1)</span></a></strong> Recall the commit history</li>
-<li> <strong><a class="man-ref" href="git-summary.html">git-summary<span class="s">(1)</span></a></strong> Show repository summary</li>
-<li> <strong><a class="man-ref" href="git-sync.html">git-sync<span class="s">(1)</span></a></strong> Sync local branch with remote branch</li>
-<li> <strong><a class="man-ref" href="git-touch.html">git-touch<span class="s">(1)</span></a></strong> Touch and add file to the index</li>
-<li> <strong><a class="man-ref" href="git-undo.html">git-undo<span class="s">(1)</span></a></strong> Remove latest commits</li>
-<li> <strong><a class="man-ref" href="git-unlock.html">git-unlock<span class="s">(1)</span></a></strong> Unlock a file excluded from version control</li>
+  <li>
+<strong><a class="man-ref" href="git-abort.html">git-abort<span class="s">(1)</span></a></strong> Abort current git operation</li>
+  <li>
+<strong><a class="man-ref" href="git-alias.html">git-alias<span class="s">(1)</span></a></strong> Define, search and show aliases</li>
+  <li>
+<strong><a class="man-ref" href="git-archive-file.html">git-archive-file<span class="s">(1)</span></a></strong> Export the current HEAD of the git repository to an archive</li>
+  <li>
+<strong><a class="man-ref" href="git-authors.html">git-authors<span class="s">(1)</span></a></strong> Generate authors report</li>
+  <li>
+<strong><a class="man-ref" href="git-browse.html">git-browse<span class="s">(1)</span></a></strong> <var>View the web page for the current repository</var>
+</li>
+  <li>
+<strong><a class="man-ref" href="git-brv.html">git-brv<span class="s">(1)</span></a></strong> List branches sorted by their last commit date</li>
+  <li>
+<strong><a class="man-ref" href="git-bulk.html">git-bulk<span class="s">(1)</span></a></strong> Run git commands on multiple repositories</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-clear-soft.html">git-clear-soft<span class="s">(1)</span></a></strong> Soft clean up a repository</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-coauthor.html">git-coauthor<span class="s">(1)</span></a></strong> Add a co-author to the last commit</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>
+  <li>
+<strong><a class="man-ref" href="git-cp.html">git-cp<span class="s">(1)</span></a></strong> Copy a file keeping its history</li>
+  <li>
+<strong><a class="man-ref" href="git-create-branch.html">git-create-branch<span class="s">(1)</span></a></strong> Create branches</li>
+  <li>
+<strong><a class="man-ref" href="git-delete-branch.html">git-delete-branch<span class="s">(1)</span></a></strong> Delete branches</li>
+  <li>
+<strong><a class="man-ref" href="git-delete-merged-branches.html">git-delete-merged-branches<span class="s">(1)</span></a></strong> Delete merged branches</li>
+  <li>
+<strong><a class="man-ref" href="git-delete-squashed-branches.html">git-delete-squashed-branches<span class="s">(1)</span></a></strong> Delete branches that were squashed</li>
+  <li>
+<strong><a class="man-ref" href="git-delete-submodule.html">git-delete-submodule<span class="s">(1)</span></a></strong> Delete submodules</li>
+  <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/Merge feature branch</li>
+  <li>
+<strong><a class="man-ref" href="git-force-clone.html">git-force-clone<span class="s">(1)</span></a></strong> overwrite local repositories with clone</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-local-commits.html">git-local-commits<span class="s">(1)</span></a></strong> List local commits</li>
+  <li>
+<strong><a class="man-ref" href="git-lock.html">git-lock<span class="s">(1)</span></a></strong> Lock a file excluded from version control</li>
+  <li>
+<strong><a class="man-ref" href="git-locked.html">git-locked<span class="s">(1)</span></a></strong> ls files that have been locked</li>
+  <li>
+<strong><a class="man-ref" href="git-magic.html">git-magic<span class="s">(1)</span></a></strong> Automate add/commit/push routines</li>
+  <li>
+<strong><a class="man-ref" href="git-merge-into.html">git-merge-into<span class="s">(1)</span></a></strong> Merge one branch into another</li>
+  <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-mr.html">git-mr<span class="s">(1)</span></a></strong> Checks out a merge request locally</li>
+  <li>
+<strong><a class="man-ref" href="git-obliterate.html">git-obliterate<span class="s">(1)</span></a></strong> rewrite past commits to remove some files</li>
+  <li>
+<strong><a class="man-ref" href="git-paste.html">git-paste<span class="s">(1)</span></a></strong> Send patches to pastebin for chat conversations</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-pull-request.html">git-pull-request<span class="s">(1)</span></a></strong> Create pull request for GitHub project</li>
+  <li>
+<strong><a class="man-ref" href="git-reauthor.html">git-reauthor<span class="s">(1)</span></a></strong> Rewrite history to change author's identity</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-release.html">git-release<span class="s">(1)</span></a></strong> Commit, tag and push changes to the repository</li>
+  <li>
+<strong><a class="man-ref" href="git-rename-branch.html">git-rename-branch<span class="s">(1)</span></a></strong> rename local branch and push to remote</li>
+  <li>
+<strong><a class="man-ref" href="git-rename-remote.html">git-rename-remote<span class="s">(1)</span></a></strong> Rename a remote</li>
+  <li>
+<strong><a class="man-ref" href="git-rename-tag.html">git-rename-tag<span class="s">(1)</span></a></strong> Rename a tag</li>
+  <li>
+<strong><a class="man-ref" href="git-repl.html">git-repl<span class="s">(1)</span></a></strong> git read-eval-print-loop</li>
+  <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>
+  <li>
+<strong><a class="man-ref" href="git-show-unmerged-branches.html">git-show-unmerged-branches<span class="s">(1)</span></a></strong> Show unmerged branches</li>
+  <li>
+<strong><a class="man-ref" href="git-squash.html">git-squash<span class="s">(1)</span></a></strong> squash N last changes up to a ref'ed commit</li>
+  <li>
+<strong><a class="man-ref" href="git-stamp.html">git-stamp<span class="s">(1)</span></a></strong> Stamp the last commit message</li>
+  <li>
+<strong><a class="man-ref" href="git-standup.html">git-standup<span class="s">(1)</span></a></strong> Recall the commit history</li>
+  <li>
+<strong><a class="man-ref" href="git-summary.html">git-summary<span class="s">(1)</span></a></strong> Show repository summary</li>
+  <li>
+<strong><a class="man-ref" href="git-sync.html">git-sync<span class="s">(1)</span></a></strong> Sync local branch with remote branch</li>
+  <li>
+<strong><a class="man-ref" href="git-touch.html">git-touch<span class="s">(1)</span></a></strong> Touch and add file to the index</li>
+  <li>
+<strong><a class="man-ref" href="git-undo.html">git-undo<span class="s">(1)</span></a></strong> Remove latest commits</li>
+  <li>
+<strong><a class="man-ref" href="git-unlock.html">git-unlock<span class="s">(1)</span></a></strong> Unlock a file excluded from version control</li>
+  <li>
+<strong><a class="man-ref" href="git-utimes.html">git-utimes<span class="s">(1)</span></a></strong> Change files modification time to their last commit date</li>
 </ul>
 
-
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>Written by Tj Holowaychuk &lt;<a href="&#x6d;&#x61;&#105;&#108;&#116;&#111;&#x3a;&#x74;&#106;&#64;&#118;&#105;&#x73;&#x69;&#x6f;&#110;&#x2d;&#x6d;&#x65;&#100;&#105;&#x61;&#46;&#x63;&#97;" data-bare-link="true">&#116;&#x6a;&#x40;&#118;&#x69;&#115;&#105;&#111;&#x6e;&#45;&#109;&#x65;&#100;&#105;&#x61;&#46;&#99;&#x61;</a>&gt;</p>
+<p>Written by Tj Holowaychuk &lt;<a href="mailto:tj@vision-media.ca" data-bare-link="true">tj@vision-media.ca</a>&gt;</p>
 
 <h2 id="REPORTING-BUGS">REPORTING BUGS</h2>
 
@@ -182,10 +258,9 @@ <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 2020</li>
+    <li class='tc'>December 2021</li>
     <li class='tr'>git-extras(1)</li>
   </ol>
 
diff --git a/man/git-extras.md b/man/git-extras.md
index 1b3cd4f59..a0d4e9e63 100644
--- a/man/git-extras.md
+++ b/man/git-extras.md
@@ -23,7 +23,7 @@ git-extras(1) -- Awesome GIT utilities
 
   `git config --add git-extras.default-branch $BRANCH`
 
-  Change the default branch to `$BRANCH` (defaut to `master`).
+  Change the default branch to `$BRANCH`. If `git-extras.default-branch` isn't set, `init.defaultBranch` is used instead. If none of them are set it defaults to `main`.
 
 ## COMMANDS