diff输出可以保持上下文吗？

Question

使用git时，git diff HEAD有助于查看自最近提交以来的更改。

但请考虑这个假设的评论：

- # If user testing shows that
+ # Management insists that
  # we need more cowbell
- # please rewrite the drum
- # routine.
+ # so be sure bass is loud
+ # to enough mask.

我觉得这更容易阅读和理解：

- # If user testing shows that
- # we need more cowbell
- # please rewrite the drum
- # routine.
+ # Management insists that
+ # we need more cowbell
+ # so be sure bass is loud
+ # enough to mask.

是否有任何工具可以产生这种差异，所以当只有几条散布的线条相同时，我们最小化变化块，而不是最小化变化线？这些工具中的任何一个是否与git diff HEAD即插即用？在提交之前查看更改时，这将非常有用。