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 599956f128f7..2c9893b9c1e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };