summaryrefslogtreecommitdiff
path: root/t/t6046-merge-skip-unneeded-updates.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-06-29 21:17:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-06-29 21:17:27 (GMT)
commit298d704e708773f6ddeb4e680265ab904d710def (patch)
treecf63ca6ce2682dfb247dec1ff0f1be06c98ed7ef /t/t6046-merge-skip-unneeded-updates.sh
parentfa2c57d562921cdd3be5c7af1ee59622439bc8cd (diff)
parentfeea6946a5b746ff4ebf8ccdf959e303203a6011 (diff)
downloadgit-298d704e708773f6ddeb4e680265ab904d710def.zip
git-298d704e708773f6ddeb4e680265ab904d710def.tar.gz
git-298d704e708773f6ddeb4e680265ab904d710def.tar.bz2
Merge branch 'sk/diff-files-show-i-t-a-as-new'
"git diff-files" has been taught to say paths that are marked as intent-to-add are new files, not modified from an empty blob. * sk/diff-files-show-i-t-a-as-new: diff-files: treat "i-t-a" files as "not-in-index"
Diffstat (limited to 't/t6046-merge-skip-unneeded-updates.sh')
0 files changed, 0 insertions, 0 deletions