Skip to content
Snippets Groups Projects

templatekw: fix consistency of diffstat with diff.merge

Previously, -T'{diffstat}' was giving stats from the diff against p1, regardless of whether --config diff.merge=yes is set.

This was inconsistent with log --patch which is aware of that option.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading