diff --git a/lib/irb/cmd/history.rb b/lib/irb/cmd/history.rb
new file mode 100644
index 00000000000000..5b712fa44d99c8
--- /dev/null
+++ b/lib/irb/cmd/history.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "stringio"
+require_relative "nop"
+require_relative "../pager"
+
+module IRB
+  # :stopdoc:
+
+  module ExtendCommand
+    class History < Nop
+      category "IRB"
+      description "Shows the input history. `-g [query]` or `-G [query]` allows you to filter the output."
+
+      def self.transform_args(args)
+        match = args&.match(/(-g|-G)\s+(?<grep>.+)\s*\n\z/)
+        return unless match
+
+        "grep: #{Regexp.new(match[:grep]).inspect}"
+      end
+
+      def execute(grep: nil)
+        formatted_inputs = irb_context.io.class::HISTORY.each_with_index.reverse_each.filter_map do |input, index|
+          next if grep && !input.match?(grep)
+
+          header = "#{index}: "
+
+          first_line, *other_lines = input.split("\n")
+          first_line = "#{header}#{first_line}"
+
+          truncated_lines = other_lines.slice!(1..) # Show 1 additional line (2 total)
+          other_lines << "..." if truncated_lines&.any?
+
+          other_lines.map! do |line|
+            " " * header.length + line
+          end
+
+          [first_line, *other_lines].join("\n") + "\n"
+        end
+
+        Pager.page_content(formatted_inputs.join)
+      end
+    end
+  end
+
+  # :startdoc:
+end
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 514293a438c549..072069d4c44dd8 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -191,6 +191,12 @@ def irb_context
       [
         :irb_show_cmds, :ShowCmds, "cmd/show_cmds",
         [:show_cmds, NO_OVERRIDE],
+      ],
+
+      [
+        :irb_history, :History, "cmd/history",
+        [:history, NO_OVERRIDE],
+        [:hist, NO_OVERRIDE],
       ]
     ]
 
diff --git a/test/irb/test_cmd.rb b/test/irb/test_cmd.rb
index 345f04bcf25a6e..a0a62e96d244c4 100644
--- a/test/irb/test_cmd.rb
+++ b/test/irb/test_cmd.rb
@@ -888,4 +888,68 @@ def test_edit_with_editor_env_var
       assert_match("command: ': code2'", out)
     end
   end
+
+  class HistoryCmdTest < CommandTestCase
+    def teardown
+      TestInputMethod.send(:remove_const, "HISTORY") if defined?(TestInputMethod::HISTORY)
+      super
+    end
+
+    def test_history
+      TestInputMethod.const_set("HISTORY", %w[foo bar baz])
+
+      out, err = without_rdoc do
+        execute_lines("history")
+      end
+
+      assert_include(out, <<~EOF)
+        2: baz
+        1: bar
+        0: foo
+      EOF
+      assert_empty err
+    end
+
+    def test_multiline_history_with_truncation
+      TestInputMethod.const_set("HISTORY", ["foo", "bar", <<~INPUT])
+        [].each do |x|
+          puts x
+        end
+      INPUT
+
+      out, err = without_rdoc do
+        execute_lines("hist")
+      end
+
+      assert_include(out, <<~EOF)
+        2: [].each do |x|
+             puts x
+           ...
+        1: bar
+        0: foo
+      EOF
+      assert_empty err
+    end
+
+    def test_history_grep
+      TestInputMethod.const_set("HISTORY", ["foo", "bar", <<~INPUT])
+        [].each do |x|
+          puts x
+        end
+      INPUT
+
+      out, err = without_rdoc do
+        execute_lines("hist -g each\n")
+      end
+
+      assert_include(out, <<~EOF)
+        2: [].each do |x|
+             puts x
+           ...
+      EOF
+      assert_empty err
+    end
+
+  end
+
 end