aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/persistent-https
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-10-12 13:51:40 -0700
committerJunio C Hamano <gitster@pobox.com>2021-10-12 13:51:40 -0700
commit872c9e67ecf9ecb525e320e46171027c7742e76a (patch)
tree7b95a402c0dd78cc2af69c7f619f9dc39363034b /contrib/persistent-https
parentMerge branch 'rs/git-mmap-uses-malloc' into maint (diff)
parentdiff-lib: ignore paths that are outside $cwd if --relative asked (diff)
downloadgit-872c9e67ecf9ecb525e320e46171027c7742e76a.tar.gz
git-872c9e67ecf9ecb525e320e46171027c7742e76a.zip
Merge branch 'dd/diff-files-unmerged-fix' into maint
"git diff --relative" segfaulted and/or produced incorrect result when there are unmerged paths. * dd/diff-files-unmerged-fix: diff-lib: ignore paths that are outside $cwd if --relative asked
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions