summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:23:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:23:04 -0800
commit3b72885bd8bd8dbd68a48d630e4e99633c93ab6f (patch)
tree382659414116d2c1bf207edd1fbe1e139f8b33bd /Documentation/git-merge.txt
parentMerge branch 'jk/credential-plug-leak' into maint (diff)
parentgc: notice gc processes run by other users (diff)
downloadtgif-3b72885bd8bd8dbd68a48d630e4e99633c93ab6f.tar.xz
Merge branch 'km/gc-eperm' into maint
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/git-merge.txt')
0 files changed, 0 insertions, 0 deletions