summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-18 13:32:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-18 13:32:54 -0800
commitb4e245a17adc1b336269f7350e88eede6e713157 (patch)
tree36762f82926a1c900c67809ce977717cd1eb0b65 /t/t7611-merge-abort.sh
parentMerge branch 'jc/sparse-error-for-developer-build' (diff)
parentblame: silently ignore invalid ignore file objects (diff)
downloadtgif-b4e245a17adc1b336269f7350e88eede6e713157.tar.xz
Merge branch 'jc/blame-ignore-fix'
"git blame --ignore-revs-file=<file>" learned to ignore a non-existent object name in the input, instead of complaining. * jc/blame-ignore-fix: blame: silently ignore invalid ignore file objects
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions