diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:10 -0700 |
| commit | 3b01d9aee0d2a54f0dd4704e22dfb49ae08203d5 (patch) | |
| tree | 147c307c143bda6b782a3e8ac9b529b68acfefa1 /xdiff/xmerge.c | |
| parent | Merge branch 'vn/revision-shorthand-for-side-branch-log' (diff) | |
| parent | blame: use DEFAULT_ABBREV macro (diff) | |
| download | tgif-3b01d9aee0d2a54f0dd4704e22dfb49ae08203d5.tar.xz | |
Merge branch 'jc/blame-abbrev'
Almost everybody uses DEFAULT_ABBREV to refer to the default
setting for the abbreviation, but "git blame" peeked into
underlying variable bypassing the macro for no good reason.
* jc/blame-abbrev:
blame: use DEFAULT_ABBREV macro
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions