summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:06:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 13:06:39 -0700
commitc8b080af7108744299e26e8d38cb6587b933f9fc (patch)
tree4854d78f67e5235d1aced705af3169b4185e8aac /xdiff
parentMerge branch 'jk/avoid-unbounded-alloca' into maint (diff)
parentadd: add --chmod=+x / --chmod=-x options (diff)
downloadtgif-c8b080af7108744299e26e8d38cb6587b933f9fc.tar.xz
Merge branch 'et/add-chmod-x' into maint
"git update-index --add --chmod=+x file" may be usable as an escape hatch, but not a friendly thing to force for people who do need to use it regularly. "git add --chmod=+x file" can be used instead. * et/add-chmod-x: add: add --chmod=+x / --chmod=-x options
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions