diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:20 -0700 |
| commit | 209f0755934a0c9b448408f9b7c9849c15041ecc (patch) | |
| tree | ea04d9cd2847c3753c778b4dc5b976f37b19c910 /mergetools/guiffy | |
| parent | Merge branch 'cc/test-oidmap' (diff) | |
| parent | t8014: remove unnecessary braces (diff) | |
| download | tgif-209f0755934a0c9b448408f9b7c9849c15041ecc.tar.xz | |
Merge branch 'br/blame-ignore'
"git blame" learned to "ignore" commits in the history, whose
effects (as well as their presence) get ignored.
* br/blame-ignore:
t8014: remove unnecessary braces
blame: drop some unused function parameters
blame: add a test to cover blame_coalesce()
blame: use the fingerprint heuristic to match ignored lines
blame: add a fingerprint heuristic to match ignored lines
blame: optionally track line fingerprints during fill_blame_origin()
blame: add config options for the output of ignored or unblamable lines
blame: add the ability to ignore commits and their changes
blame: use a helper function in blame_chunk()
Move oidset_parse_file() to oidset.c
fsck: rename and touch up init_skiplist()
Diffstat (limited to 'mergetools/guiffy')
0 files changed, 0 insertions, 0 deletions