summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-10 10:33:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-10 10:33:30 -0800
commit55869681f1f0dc3fe9df0dd95f554f94dd519b72 (patch)
tree764cb358fee370732abe1f3b42de5ec2ec9bb516 /Documentation/technical/trivial-merge.txt
parentMerge branch 'jk/http-auth-tests-robustify' (diff)
parentgc: notice gc processes run by other users (diff)
downloadtgif-55869681f1f0dc3fe9df0dd95f554f94dd519b72.tar.xz
Merge branch 'km/gc-eperm'
A "gc" process running as a different user should be able to stop a new "gc" process from starting. * km/gc-eperm: gc: notice gc processes run by other users
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions