diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:39 -0800 |
| commit | b6fb70c985a6fc113e971a6696f328abf8315dce (patch) | |
| tree | 4b9e3bfc3f87b29bcf0d64382fae38762d1202ab /Documentation/git-merge-index.txt | |
| parent | Merge branch 'bk/sob-dco' (diff) | |
| parent | contrib/completion: complete `git diff --merge-base` (diff) | |
| download | tgif-b6fb70c985a6fc113e971a6696f328abf8315dce.tar.xz | |
Merge branch 'dl/diff-merge-base'
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
* dl/diff-merge-base:
contrib/completion: complete `git diff --merge-base`
builtin/diff-tree: learn --merge-base
builtin/diff-index: learn --merge-base
t4068: add --merge-base tests
diff-lib: define diff_get_merge_base()
diff-lib: accept option flags in run_diff_index()
contrib/completion: extract common diff/difftool options
git-diff.txt: backtick quote command text
git-diff-index.txt: make --cached description a proper sentence
t4068: remove unnecessary >tmp
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions