From a73c19c14ba965d642562c02ddd23e4d41d1ebfd Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Fri, 22 Apr 2022 16:32:01 +0800
Subject: [PATCH] Version 6.4.0

Signed-off-by: spacewander <spacewanderlzx@gmail.com>
---
 AUTHORS        |  7 ++++++-
 History.md     | 44 ++++++++++++++++++++++++++++++++++++++++++++
 bin/git-extras |  2 +-
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1ac1bd4..df4525b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ Patches and Suggestions
 - Jonhnny Weslley
 - LeeW
 - Niklas Schlimm
+- Tobias Fendin
 - nickl-
 - timfeirg
 - CJ
@@ -36,7 +37,6 @@ Patches and Suggestions
 - Mark Pitman
 - Luke Childs
 - Sasha Khamkov
-- Tobias Fendin
 - equt
 - vyas
 - Don Harper
@@ -49,6 +49,7 @@ Patches and Suggestions
 - Chris Hall
 - Damian Krzeminski
 - NANRI
+- Peter Benjamin
 - Alexander Krasnukhin
 - Phally
 - Rico Sta. Cruz
@@ -70,6 +71,7 @@ Patches and Suggestions
 - Vladimir Jimenez
 - gisphm
 - jacobherrington
+- overengineer
 - phigoro
 - wooorm
 - Alexis GRIMALDI
@@ -159,6 +161,7 @@ Patches and Suggestions
 - Heiko Becker
 - Isaac Mungai
 - J.C. Yamokoski
+- Jack O. Wasey
 - James Manning
 - James Zhu
 - Jan Krueger
@@ -174,6 +177,7 @@ Patches and Suggestions
 - Jon Ander Peñalba
 - Joshua Appelman
 - José María Gutiérrez @TheTechOddBug
+- Katrin Leinweber
 - Kevin Woo
 - Konstantin Schukraft
 - Leandro López
@@ -241,6 +245,7 @@ Patches and Suggestions
 - neydroid
 - nulltask
 - sgleizes
+- tfendin
 - tiemonl
 - zentarul
 - zeroDivisible
diff --git a/History.md b/History.md
index a3103ff..6fe06dd 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,47 @@
+6.4.0 / 2022-04-22
+==================
+
+  * Merge pull request #964 from spacewander/bro
+  * git-browse/browse-ci: use powershell.exe only when it is available
+  * Merge pull request #944 from SimonTate/feature/sem-ver-prefix
+  * Merge pull request #957 from jackwasey/quiet-or-stderr
+  * git-release: Add prefix to semver
+  * Merge pull request #959 from pbnj/feat/git-browse-ci
+  * fix: fix stderr & stdout redirect
+  * Merge pull request #962 from spacewander/gicc
+  * git-ignore-io: make sure .gi_list is created before access
+  * git-ignore: the directory of target file may not exist
+  * fix(git-browse-ci): set pipefail
+  * docs: fix docs
+  * chore: update docs & completions
+  * feat: implement git-browse-ci
+  * quiet option, errors to stderr
+  * Merge pull request #956 from tfendin/xargs-conflicting-args
+  * Removed xargs from git-effort
+  * Merge pull request #955 from katrinleinweber/summary-highlight-path-opt
+  * Highlight path option more
+  * Merge pull request #951 from tfendin/local-commits-all-remotes
+  * Updated manual for git local-commits, must track a branch
+  * Merge pull request #946 from tfendin/default_branch_logic
+  * Made local-commits work with all remotes
+  * Updated Readme.md after review
+  * Merge pull request #949 from tfendin/git-ignore-ensure-newline
+  * Added section about main branch to the Readme file
+  * Merge pull request #947 from tfendin/git-unlock-synopsis-fix
+  * Merge pull request #948 from tfendin/git-ignore-core-excludesFile
+  * Clarified comment of when newline should be added
+  * Updated git-extras manual after review.
+  * git-ignore: ensure new patterns comes after a newline
+  * Fixed bug in git-ignore which ignored config core.excludeFiles
+  * Spell corr in git-unlock synopsis
+  * Consider init.defaultBranch in git_extra_default_branch, changed default branch to main.
+  * Merge pull request #885 from spacewander/add_pkg
+  * doc: add packaging status
+  * Merge pull request #940 from overengineer/feature/magic
+  * Ignored error when git restore --staged fails when there is no commit
+  * Merge branch 'master' into merge/magic
+  * Added git-magic command
+  * Bump version to 6.4.0-dev
 
 6.3.0 / 2021-10-02
 ==================
diff --git a/bin/git-extras b/bin/git-extras
index a86fb6e..e9fb056 100755
--- a/bin/git-extras
+++ b/bin/git-extras
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="6.4.0-dev"
+VERSION="6.4.0"
 INSTALL_SCRIPT="https://raw.githubusercontent.com/tj/git-extras/master/install.sh"
 
 update() {