Skip to content

Fix multi-commit diff arguments #1784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benjiwolff wants to merge 3 commits into
base: master
Choose a base branch
from
+4 −2
Open

Fix multi-commit diff arguments #1784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01a74ac
always show forward diff and include changes from last commit
benjiwolff Jul 26, 2025
38c0e36
fix recent commits multi commit diff
benjiwolff Jul 26, 2025
fe83653
Merge remote-tracking branch 'origin/master' into fix-log-multi-commi…
benjiwolff Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lua/neogit/buffers/log_view/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ function M:open()
p { commits = self.buffer.ui:get_commits_in_selection() }
end),
[popups.mapping_for("DiffPopup")] = popups.open("diff", function(p)
local items = self.buffer.ui:get_ordered_commits_in_selection()
local items = self.buffer.ui:get_commits_in_selection()
table.insert(items, 1, items[1] .. "~1")
p {
section = { name = "log" },
item = { name = items },
Expand Down
3 changes: 2 additions & 1 deletion lua/neogit/buffers/status/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,8 @@ end
M.v_diff_popup = function(self)
return popups.open("diff", function(p)
local section = self.buffer.ui:get_selection().section
local item = self.buffer.ui:get_yankable_under_cursor()
local item = self.buffer.ui:get_commits_in_selection()
table.insert(item, 1, item[1] .. "~1")
p { section = { name = section and section.name }, item = { name = item } }
end)
end
Expand Down
Loading