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