tree 045f5411d2fa96f810aa11e1c4f93176644a4142
parent 12f5eb9f082d7f4cb083a11aa59ac8bbd5e1589a
parent 78b76d310f3e9c0cc1e990ed93f58711e48d9ab2
author Junio C Hamano <gitster@pobox.com> 1594855784 -0700
committer Junio C Hamano <gitster@pobox.com> 1594855784 -0700

Merge branch 'ct/diff-with-merge-base-clarification' into master

Doc update.

* ct/diff-with-merge-base-clarification:
  git-diff.txt: reorder possible usages
  git-diff.txt: don't mark required argument as optional