Skip to content

Add merge commit #53

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

Merged
ianthomas23 merged 3 commits into from
Oct 31, 2025
Merged

Add merge commit #53

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c4b6d9
Add merge commit
SandrineP Oct 30, 2025
62e24e2
address review comments
SandrineP Oct 31, 2025
5efcd85
small fix
SandrineP Oct 31, 2025
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
Prev Previous commit
small fix
  • Loading branch information
@SandrineP
SandrineP committed Oct 31, 2025
commit 5efcd8501e19b825c7ad84ed95a57ed68a5fe7bc
10 changes: 1 addition & 9 deletions src/subcommand/merge_subcommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,7 @@ void merge_subcommand::create_merge_commit(
auto author_committer_sign_now = signature_wrapper::signature_now(author_name, author_email, author_name, author_email);

// TODO: add a prompt to edit the merge message
std::string msg_target = "";
if (merge_ref)
{
msg_target = merge_ref->short_name();
}
else
{
msg_target = git_oid_tostr_s(&(merge_commit.oid()));
}
std::string msg_target = merge_ref ? merge_ref->short_name() : git_oid_tostr_s(&(merge_commit.oid()));
std::string msg = merge_ref ? "Merge branch " : "Merge commit ";
msg.append(msg_target);

Expand Down