On 7/1/19 12:29 PM, Junio C Hamano wrote:
Barret Rhoden <brho@xxxxxxxxxx> writes:
On 6/28/19 2:24 AM, Jeff King wrote:
On Wed, Jun 26, 2019 at 03:29:29PM -0700, Junio C Hamano wrote:
* br/blame-ignore (2019-06-20) 9 commits
- 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()
"git blame" learned to "ignore" commits in the history, whose
effects (as well as their presence) get ignored.
Will merge to 'next'.
cf. <20190620163820.231316-1-brho@xxxxxxxxxx> (v9)
My -Wunused-parameter branch complained about merging with this. Since
it's in 'next', we'd want something like this on top, I think (ideally
after Barret confirms my hand-waving below).
Looks good to me.
Thanks for a quick response. I'll queue Peff's fixup on top of what
is shown above.
The patches are already in 'next', so we'll go incremental to fix
any issues discovered in the series from here on, instead of
replacing the series wholesale.
Thanks.
Sounds good, thanks. Please disregard my v10 series then.
The other change in my v10 was squashing the following commit, which you
might want to grab for next:
https://public-inbox.org/git/20190630181732.4128-1-michael@xxxxxxxxx/
Thanks,
Barret
