diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-04 12:49:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-04 12:49:07 -0700 |
| commit | 230ff3e9970755fe4ba2e69165eab1f61752f1d1 (patch) | |
| tree | cc263e9c30b5a2ec7d13f94a7b93704fd13d5324 /builtin/merge.c | |
| parent | Merge branch 'jk/drop-unaligned-loads' (diff) | |
| parent | blame: validate and peel the object names on the ignore list (diff) | |
| download | tgif-230ff3e9970755fe4ba2e69165eab1f61752f1d1.tar.xz | |
Merge branch 'jc/blame-ignore-fix'
"git blame --ignore-rev/--ignore-revs-file" failed to validate
their input are valid revision, and failed to take into account
that the user may want to give an annotated tag instead of a
commit, which has been corrected.
* jc/blame-ignore-fix:
blame: validate and peel the object names on the ignore list
t8013: minimum preparatory clean-up
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions