diff --git a/pkgs/applications/version-management/git-branchstack/default.nix b/pkgs/applications/version-management/git-branchstack/default.nix
new file mode 100644
index 000000000000..b536642cbf55
--- /dev/null
+++ b/pkgs/applications/version-management/git-branchstack/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, fetchPypi
+, buildPythonApplication
+, git-revise
+}:
+
+buildPythonApplication rec {
+  pname = "git-branchstack";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ=";
+  };
+
+  buildInputs = [
+    git-revise
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/krobelus/git-branchstack";
+    description = "Efficiently manage Git branches without leaving your local branch";
+    license = licenses.mit;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f78644b13a2..7aa75cfc90fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -416,10 +416,6 @@ with pkgs;
 
   comedilib = callPackage ../development/libraries/comedilib {  };
 
-  commitlint = nodePackages."@commitlint/cli";
-
-  commit-formatter = callPackage ../applications/version-management/commit-formatter { };
-
   commix = callPackage ../tools/security/commix { };
 
   conserver = callPackage ../tools/misc/conserver { };
@@ -448,8 +444,6 @@ with pkgs;
 
   databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
 
-  datalad = callPackage ../applications/version-management/datalad { };
-
   dhallDirectoryToNix = callPackage ../build-support/dhall/directory-to-nix.nix { };
 
   dhallPackageToNix = callPackage ../build-support/dhall/package-to-nix.nix { };
@@ -1587,8 +1581,14 @@ with pkgs;
 
   cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { };
 
+  commit-formatter = callPackage ../applications/version-management/commit-formatter { };
+
+  commitlint = nodePackages."@commitlint/cli";
+
   conform = callPackage ../applications/version-management/conform { };
 
+  datalad = callPackage ../applications/version-management/datalad { };
+
   darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };
 
   delta = callPackage ../applications/version-management/delta {
@@ -1667,6 +1667,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
+  git-branchstack = python3.pkgs.callPackage ../applications/version-management/git-branchstack { };
+
   git-bug = callPackage ../applications/version-management/git-bug { };
 
   git-chglog = callPackage ../applications/version-management/git-chglog { };