diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-09-14 18:36:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-21 20:37:03 (GMT) |
| commit | 3d09c22869a7bd47f1683031937af0ed93b2fa3b (patch) | |
| tree | 045ced9ffc692b665a5eec38611e9f75755399e4 /mergetools | |
| parent | 0f5a1d449b9538c2765de9d6683abbb83a7fb4e2 (diff) | |
| download | git-3d09c22869a7bd47f1683031937af0ed93b2fa3b.zip git-3d09c22869a7bd47f1683031937af0ed93b2fa3b.tar.gz git-3d09c22869a7bd47f1683031937af0ed93b2fa3b.tar.bz2 | |
builtin/diff-tree: learn --merge-base
The previous commit introduced ---merge-base a way to take the diff
between the working tree or index and the merge base between an arbitrary
commit and HEAD. It makes sense to extend this option to support the
case where two commits are given too and behave in a manner identical to
`git diff A...B`.
Introduce the --merge-base flag as an alternative to triple-dot
notation. Thus, we would be able to write the above as
`git diff --merge-base A B`.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions