diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-04-30 13:50:26 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 13:50:26 +0900 |
| commit | 59bb0aa93e6edaca44b2a5488fc915d468bae46f (patch) | |
| tree | 767fc86623415632a6cbee709b2484bf0d91d53a /t/t5553-set-upstream.sh | |
| parent | Merge branch 'ds/sparse-index-protections' (diff) | |
| parent | doc/diff-options: document new --diff-merges features (diff) | |
| download | tgif-59bb0aa93e6edaca44b2a5488fc915d468bae46f.tar.xz | |
Merge branch 'so/log-diff-merge'
"git log" learned "--diff-merges=<style>" option, with an
associated configuration variable log.diffMerges.
* so/log-diff-merge:
doc/diff-options: document new --diff-merges features
diff-merges: introduce log.diffMerges config variable
diff-merges: adapt -m to enable default diff format
diff-merges: refactor set_diff_merges()
diff-merges: introduce --diff-merges=on
Diffstat (limited to 't/t5553-set-upstream.sh')
0 files changed, 0 insertions, 0 deletions