[go: up one dir, main page]

Skip to content

Add possibility or use by default git show to show merge commits

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

Problem to solve

Insane huge diffs on merge commits. Unable to quickly see what was changed only in merge commit (conflicts resolution).

Intended users

Feature for everyone!

Further details

Instead of crawling thru huge amount of changed lines in both branches it will be possible to see only what the merge changed.

Proposal

Add option to show (maybe by default - since it's faster) the merge commit using git show instead of diff to parent

Permissions and Security

The same requirement as diff to parent

Documentation

Testing

I see no additional risk over diff to parent

What does success look like, and how can we measure that?

User is able to see only changes done by merge commit (like merge conflicts resolution). Nothing more is visible in merge commit (in mode git show, git diff mode would work as is)

Links / references

Short description of issue and solution https://haacked.com/archive/2014/02/21/reviewing-merge-commits/

Edited by 🤖 GitLab Bot 🤖