summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-04-17 10:28:17 -0700
committerJunio C Hamano <gitster@pobox.com>2025-04-17 10:28:18 -0700
commitfe7ae3b87ef866e4818a106e8ce6e3d821ed76d7 (patch)
tree62b9e3f9ef561e61f39593f245a49c4f0a727f59 /merge-recursive.c
parentb45113f5818b26bf22b85988f9ef7ff2da06d4a1 (diff)
parent4d253071ddd44ee5fad88702431603d43215b3af (diff)
Merge branch 'kn/blame-porcelain-unblamable'
"git blame --porcelain" mode now talks about unblamable lines and lines that are blamed to an ignored commit. * kn/blame-porcelain-unblamable: blame: print unblamable and ignored commits in porcelain mode
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions